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

controllers/sg/his_api_controller.go

@@ -7115,15 +7115,15 @@ func (c *HisApiController) PutRecord() {
 			}
 
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
-			result := service.Gdyb2503(his.PsnNo, res.Output.Iinfo[0].Insutype, miConfig.OrgName, patientPrescription.Doctor, miConfig.Code, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "重症尿毒症透析(血透)", "M07801")
+			//result := service.Gdyb2503(his.PsnNo, res.Output.Iinfo[0].Insutype, miConfig.OrgName, patientPrescription.Doctor, miConfig.Code, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "重症尿毒症透析(血透)", "M07801")
 			result2 := service.Gdyb5301(his.PsnNo, res.Output.Iinfo[0].Insutype, miConfig.OrgName, patientPrescription.Doctor, miConfig.Code, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "重症尿毒症透析(血透)", "M07801")
 
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
-			}
+			//var dat map[string]interface{}
+			//if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			//	fmt.Println(dat)
+			//} else {
+			//	fmt.Println(err)
+			//}
 
 			var dat2 map[string]interface{}
 			if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
@@ -7705,9 +7705,9 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	doctor_id, _ := c.GetInt64("doctor_id")
 	sick_id, _ := c.GetInt64("sick_id")
 	department_id, _ := c.GetInt64("department_id")
-	start_time, _ := c.GetString("start_time")
-	end_time, _ := c.GetString("end_time")
-	check_time, _ := c.GetString("check_time")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	check_time := c.GetString("check_time")
 
 	adminUser := c.GetAdminUserInfo()
 	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)