Commit ba695b3f by 赵增煜

fix

parent 7c2c14ce
...@@ -117,8 +117,8 @@ public function drugLimit(Request $request) ...@@ -117,8 +117,8 @@ public function drugLimit(Request $request)
$sevenDaysAgo = Carbon::now()->subDays(7); $sevenDaysAgo = Carbon::now()->subDays(7);
$prescriptions = PrescriptionModel::where('patient_id', $patient_id) $prescriptions = PrescriptionModel::where('patient_id', $patient_id)
->where('is_voided', PrescriptionModel::IS_VOIDED_FALSE) # 未作废的处方 ->where('is_voided', PrescriptionModel::IS_VOIDED_FALSE) // 未作废的处方
->where('status', PrescriptionModel::PRESCRIPTION_STATUS_SUCCESS) # ->where('status', PrescriptionModel::PRESCRIPTION_STATUS_SUCCESS) //
->where('pharmacy_id', $pharmacy_id) ->where('pharmacy_id', $pharmacy_id)
->where('created_at', '>=', $sevenDaysAgo) ->where('created_at', '>=', $sevenDaysAgo)
->get(); ->get();
......
...@@ -180,8 +180,8 @@ public function bindRole(Request $request) ...@@ -180,8 +180,8 @@ public function bindRole(Request $request)
$doctor->user_id = $authInfo->id; $doctor->user_id = $authInfo->id;
$doctor->save(); $doctor->save();
# 清除验证码 // 清除验证码
cache()->put("sms_verification_code_{$mobile}", "0", 60); cache()->put("sms_verification_code_{$mobile}", '0', 60);
} else { } else {
return $this->failed('登录类型错误'); return $this->failed('登录类型错误');
} }
......
{ {
"name": "codemirror", "name": "codemirror",
"version":"5.0.0", "version": "5.0.0",
"main": "lib/codemirror.js", "main": "lib/codemirror.js",
"description": "In-browser code editing made bearable", "description": "In-browser code editing made bearable",
"licenses": [{"type": "MIT", "licenses": [
"url": "http://codemirror.net/LICENSE"}], {
"directories": {"lib": "./lib"}, "type": "MIT",
"scripts": {"test": "node ./test/run.js"}, "url": "http://codemirror.net/LICENSE"
"devDependencies": {"node-static": "0.6.0", }
"phantomjs": "1.9.2-5", ],
"blint": ">=0.1.1"}, "directories": {
"lib": "./lib"
},
"scripts": {
"test": "node ./test/run.js"
},
"devDependencies": {
"blint": ">=0.1.1",
"node-static": "0.6.0",
"phantomjs": "1.9.2-5"
},
"bugs": "http://github.com/codemirror/CodeMirror/issues", "bugs": "http://github.com/codemirror/CodeMirror/issues",
"keywords": ["JavaScript", "CodeMirror", "Editor"], "keywords": [
"JavaScript",
"CodeMirror",
"Editor"
],
"homepage": "http://codemirror.net", "homepage": "http://codemirror.net",
"maintainers":[{"name": "Marijn Haverbeke", "maintainers": [
"email": "marijnh@gmail.com", {
"web": "http://marijnhaverbeke.nl"}], "name": "Marijn Haverbeke",
"repository": {"type": "git", "email": "marijnh@gmail.com",
"url": "https://github.com/codemirror/CodeMirror.git"} "web": "http://marijnhaverbeke.nl"
}
],
"repository": {
"type": "git",
"url": "https://github.com/codemirror/CodeMirror.git"
},
"dependencies": {
"codemirror": "file:"
}
} }
...@@ -38,5 +38,8 @@ ...@@ -38,5 +38,8 @@
"gulp-ruby-sass": "^1.0.1", "gulp-ruby-sass": "^1.0.1",
"gulp-uglifyjs": "^0.6.1", "gulp-uglifyjs": "^0.6.1",
"gulp-util": "^3.0.1" "gulp-util": "^3.0.1"
},
"dependencies": {
"editor.md": "file:"
} }
} }
{ {
"name": "codemirror", "name": "codemirror",
"version":"5.0.0", "version": "5.0.0",
"main": "lib/codemirror.js", "main": "lib/codemirror.js",
"description": "In-browser code editing made bearable", "description": "In-browser code editing made bearable",
"licenses": [{"type": "MIT", "licenses": [
"url": "http://codemirror.net/LICENSE"}], {
"directories": {"lib": "./lib"}, "type": "MIT",
"scripts": {"test": "node ./test/run.js"}, "url": "http://codemirror.net/LICENSE"
"devDependencies": {"node-static": "0.6.0", }
"phantomjs": "1.9.2-5", ],
"blint": ">=0.1.1"}, "directories": {
"lib": "./lib"
},
"scripts": {
"test": "node ./test/run.js"
},
"devDependencies": {
"blint": ">=0.1.1",
"node-static": "0.6.0",
"phantomjs": "1.9.2-5"
},
"bugs": "http://github.com/codemirror/CodeMirror/issues", "bugs": "http://github.com/codemirror/CodeMirror/issues",
"keywords": ["JavaScript", "CodeMirror", "Editor"], "keywords": [
"JavaScript",
"CodeMirror",
"Editor"
],
"homepage": "http://codemirror.net", "homepage": "http://codemirror.net",
"maintainers":[{"name": "Marijn Haverbeke", "maintainers": [
"email": "marijnh@gmail.com", {
"web": "http://marijnhaverbeke.nl"}], "name": "Marijn Haverbeke",
"repository": {"type": "git", "email": "marijnh@gmail.com",
"url": "https://github.com/codemirror/CodeMirror.git"} "web": "http://marijnhaverbeke.nl"
}
],
"repository": {
"type": "git",
"url": "https://github.com/codemirror/CodeMirror.git"
},
"dependencies": {
"codemirror": "file:"
}
} }
...@@ -38,5 +38,8 @@ ...@@ -38,5 +38,8 @@
"gulp-ruby-sass": "^1.0.1", "gulp-ruby-sass": "^1.0.1",
"gulp-uglifyjs": "^0.6.1", "gulp-uglifyjs": "^0.6.1",
"gulp-util": "^3.0.1" "gulp-util": "^3.0.1"
},
"dependencies": {
"editor.md": "file:"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment