Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -220,6 +220,7 @@ func (this *DialysisAPIController) WaitingScheduals() {
 // @param patient_id:int
 // @param date:string (yyyy-MM-dd)
 func (this *DialysisAPIController) DialysisRecord() {
+
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
 	if patientID <= 0 {
@@ -284,6 +285,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
+	fmt.Println("----------------------------", getDialysisOrderErr)
 	if getDialysisOrderErr != nil {
 		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2080,6 +2080,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 }
 
 func (c *PatientApiController) GetPrintDialysisOrder() {
+	fmt.Println("触发-------------------------")
 	xtno := c.GetString("xtno")
 	xtdate := c.GetString("xtdate")
 
@@ -2154,7 +2155,6 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"users":                   adminUser,
 		"patientInfo":             patientInfo,