Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

.idea/misc.xml

@@ -3,4 +3,24 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="myConfigurationMap">
+      <map>
+        <entry key="$PROJECT_DIR$/../CDM">
+          <value>
+            <SvnBranchConfiguration>
+              <option name="trunkUrl" value="svn://112.74.16.180/Product/SGJ/SGJ1.0/Project/SGJ1.0/Application/MBGL" />
+            </SvnBranchConfiguration>
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/../SYB_Admin">
+          <value>
+            <SvnBranchConfiguration>
+              <option name="trunkUrl" value="svn://112.74.16.180/Product/SYB/SYB1.0/Application/SYB_Admin" />
+            </SvnBranchConfiguration>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>

controllers/doctors_api_controller.go

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

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -42,6 +42,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	//获取his医嘱数据
 	fmt.Println("date.un222222", date.Unix())
 	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix())
+	config, _ := service.GetHisDoctorConfig(orgID)
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
 	if err != nil {
 		this.ErrorLog("获取排班信息失败:%v", err)
@@ -57,6 +58,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 			"scheduals":  filtedScheduals,
 			"adminUser":  adminUser,
 			"hisAdvices": hisAdvices,
+			"config":     config,
 		})
 	}
 }

service/mobile_dialysis_service.go

@@ -1674,3 +1674,9 @@ type HisMScheduleDoctorAdviceVM struct {
 func (HisMScheduleDoctorAdviceVM) TableName() string {
 	return "xt_schedule"
 }
+
+func GetHisDoctorConfig(orgid int64) (models.XtHisConfig, error) {
+	config := models.XtHisConfig{}
+	err := XTReadDB().Model(&config).Where("user_org_id = ? and status =1", orgid).Find(&config).Error
+	return config, err
+}