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

controllers/sg/his_api_controller.go

@@ -2679,6 +2679,8 @@ func (c *HisApiController) RefundNumber() {
 	patient_id, _ := c.GetInt64("patient_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
+	his_patient_id, _ := c.GetInt64("id")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	adminUser := c.GetAdminUserInfo()
@@ -2689,7 +2691,9 @@ func (c *HisApiController) RefundNumber() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+
+	his, _ := service.GetHisPatientRecord(adminUser.CurrentOrgId, his_patient_id)
 	//patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	//order, _ := service.GetHisOrderByID(order_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -2720,17 +2724,37 @@ func (c *HisApiController) RefundNumber() {
 			return
 		}
 
-		//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
-		service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+		respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes3, _ := json.Marshal(respJSON3)
 
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "退号成功",
-			})
-		} else {
+		var res2 ResultSix
+		if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
+
+		if res2.Infcode == 0 {
+			//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
+			service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "退号成功",
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"code": -10,
+				"msg":  res2.ErrMsg,
+			})
+
+		}
+
 	} else {
 		//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
 		//if err == nil {

service/his_service.go

@@ -456,6 +456,11 @@ func GetVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (inf
 	return
 }
 
+func GetHisPatientRecord(org_id int64, id int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&info).Error
+	return
+}
+
 func CreateOrder(order *models.HisOrder) (err error) {
 	err = writeDb.Create(&order).Error
 	return