医保对接

controllers/his_api_controller.go

@@ -1001,7 +1001,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				if id > 0 {
 					new_prescription, err := service.GetPrescriptionById(id, adminInfo.CurrentOrgId)
 					if err != nil {
-						if new_prescription.OrderStatus == 2 {
+						if new_prescription.OrderStatus == 2 || new_prescription.OrderStatus == 4 {
 							isCharge = true
 						}
 					}
@@ -1009,11 +1009,9 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 					advices := items["advices"].([]interface{})
-					fmt.Println("~~~~~~~~4")
 
 					if len(advices) > 0 {
 						for _, advice := range advices {
-							fmt.Println("~~~~~~~~3")
 
 							var adviceId int64
 							if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
@@ -1021,12 +1019,10 @@ func (c *HisApiController) CreateHisPrescription() {
 							}
 							if adviceId > 0 {
 								his_advice_info, err := service.GetHisDoctorAdviceInfo(adviceId)
-								fmt.Println("~~~~~~~~1")
-								fmt.Println("~~~~~~~~1")
 
 								if err == nil {
 									if his_advice_info.IsMedicine == 1 {
-										fmt.Println("~~~~~~~~2")
+
 										isMidicine = true
 									}
 								}
@@ -2375,7 +2371,7 @@ func (c *HisApiController) DeletePrescription() {
 	}
 
 	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 {
+		if item.OrderStatus == 2 || item.OrderStatus == 4 {
 			isCharge = true
 		}
 	}
@@ -2651,7 +2647,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 		}
 	}
 	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 {
+		if item.OrderStatus == 2 || item.OrderStatus == 4 {
 			isCharge = true
 		}
 	}
@@ -2746,7 +2742,7 @@ func (c *HisApiController) DeleteProject() {
 		}
 	}
 	for _, item := range new_prescriptions {
-		if item.OrderStatus == 2 {
+		if item.OrderStatus == 2 || item.OrderStatus == 4 {
 			isCharge = true
 		}
 	}

enums/error_code.go

@@ -502,12 +502,12 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCheckGoodParamWrong:   "该入库单已出库,反审核失败!",
 
 	ErrorCodeMedicineWrong: "处方中包含已发药的药品,无法保存或修改",
-	ErrorCodeChargeWrong:   "处方中包含已收费处方,无法保存或修改",
+	ErrorCodeChargeWrong:   "处方中包含已收费处方或已经上传的处方,无法保存或修改",
 
 	ErrorCodeDeletePMedicineWrong:  "处方中包含已发药的药品,无法删除",
-	ErrorCodeDeletePChargeWrong:    "处方中包含收费处方,无法删除",
+	ErrorCodeDeletePChargeWrong:    "处方中包含收费处方或已经上传的处方,无法删除",
 	ErrorCodeDeleteMedicineWrong:   "该药品已经发药,无法删除",
-	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费,无法删除",
+	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费或已经上传的处方,无法删除",
 }
 
 type SGJError struct {