Browse Source

耗材参数

XMLWAN 4 years ago
parent
commit
76996ba6a0
2 changed files with 22 additions and 0 deletions
  1. 20 0
      .idea/misc.xml
  2. 2 0
      controllers/doctors_api_controller.go

+ 20 - 0
.idea/misc.xml View File

@@ -3,4 +3,24 @@
3 3
   <component name="JavaScriptSettings">
4 4
     <option name="languageLevel" value="ES6" />
5 5
   </component>
6
+  <component name="SvnBranchConfigurationManager">
7
+    <option name="myConfigurationMap">
8
+      <map>
9
+        <entry key="$PROJECT_DIR$/../CDM">
10
+          <value>
11
+            <SvnBranchConfiguration>
12
+              <option name="trunkUrl" value="svn://112.74.16.180/Product/SGJ/SGJ1.0/Project/SGJ1.0/Application/MBGL" />
13
+            </SvnBranchConfiguration>
14
+          </value>
15
+        </entry>
16
+        <entry key="$PROJECT_DIR$/../SYB_Admin">
17
+          <value>
18
+            <SvnBranchConfiguration>
19
+              <option name="trunkUrl" value="svn://112.74.16.180/Product/SYB/SYB1.0/Application/SYB_Admin" />
20
+            </SvnBranchConfiguration>
21
+          </value>
22
+        </entry>
23
+      </map>
24
+    </option>
25
+  </component>
6 26
 </project>

+ 2 - 0
controllers/doctors_api_controller.go View File

@@ -54,6 +54,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
54 54
 
55 55
 	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id)
56 56
 	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix())
57
+	config, _ := service.GetHisDoctorConfig(orgID)
57 58
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
58 59
 	if err != nil {
59 60
 		c.ErrorLog("获取排班信息失败:%v", err)
@@ -69,6 +70,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
69 70
 			"scheduals":  filtedScheduals,
70 71
 			"adminUser":  adminUser,
71 72
 			"hisAdvices": hisAdvices,
73
+			"config":     config,
72 74
 		})
73 75
 	}
74 76
 }