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

controllers/his_api_controller.go

@@ -1058,7 +1058,6 @@ func (c *HisApiController) CreateHisPrescription() {
 								var drug_id int64
 								var prescribing_number float64
 								var prescribingNumberUnit string
-								//var prescribingNumber string
 
 								var adviceId int64
 								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
@@ -1067,7 +1066,6 @@ func (c *HisApiController) CreateHisPrescription() {
 								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
 									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
 									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
-									//prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
 								}
 
 								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
@@ -1087,6 +1085,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 								//查询药品的所有库存
 								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+
 								var total_count int64
 								for _, it := range list {
 									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
@@ -1094,26 +1093,47 @@ func (c *HisApiController) CreateHisPrescription() {
 								totals := strconv.FormatInt(total_count, 10)
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
-								fmt.Println("advicleise23223323233223w", advicelist.PrescribingNumber)
+
+								//查询最新批次库存
+								info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+								var batch_number_count int64
+								batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+								batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
+									batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 									if prescribingNumberUnit == drug.MinUnit {
-										if prescribing_number > all_count {
-											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-											return
+
+										if drug.IsUse != 1 {
+											if prescribing_number > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
+											if prescribing_number > batch_number_all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+												return
+											}
 										}
 
 									}
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
-										if num > all_count {
-											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-											return
+										if drug.IsUse != 1 {
+											if num > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
+											if num > batch_number_all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+												return
+											}
 										}
 									}
-
 								}
+
 								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 								if drugOutConfig.IsOpen != 1 {
 									//修改处方
@@ -1159,24 +1179,51 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										//新增处方
 										if advicelist.ID == 0 {
+											//查询最新批次库存
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+											batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 											all_count, _ := strconv.ParseFloat(totals, 64)
 											if prescribingNumberUnit == drug.MinUnit {
-												if prescribing_number > all_count {
-													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-													return
+												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+												if drug.IsUse != 1 {
+													if prescribing_number > all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+													if prescribing_number > batch_number_all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
 												}
+
 											} else {
 												if prescribingNumberUnit == drug.MaxUnit {
+													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
-													if num > all_count {
-														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-														return
+													if drug.IsUse != 1 {
+														if num > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+
+														if prescribing_number > batch_number_all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+															return
+														}
 													}
+
 												}
 											}
 										}
 										//修改处方
 										if advicelist.ID > 0 {
+											//查询最新批次库存
+											info, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
+											var batch_number_count int64
+											batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+
 											var device_number int64
 
 											if advicelist.PrescribingNumberUnit == drug.MaxUnit {
@@ -1203,10 +1250,17 @@ func (c *HisApiController) CreateHisPrescription() {
 											//如果修改的数量大于之前修改的数量
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
-												if (number_count - device_number) > total_count {
-													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-													return
+												if drug.IsUse != 1 {
+													if (number_count - device_number) > total_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+													if (number_count - device_number) > batch_number_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
+														return
+													}
 												}
+
 											}
 
 											if device_number != number_count {
@@ -2470,7 +2524,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 		if drugStockConfig.IsOpen == 1 {
 
 			//查询是否在处方中出库
-			openConfig, _ := service.GetDrugOpenConfig(c.GetAdminUserInfo().CurrentOrgId)
+			openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
 			if openConfig.IsOpen != 1 {
 
 				//判断该医嘱是否执行了

controllers/manager_center_api_controller.go

@@ -313,6 +313,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
 	is_user, _ := c.GetInt64("is_user")
+	sum_count, _ := c.GetInt64("sum_count")
+	sum_in_count, _ := c.GetInt64("sum_in_count")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{
@@ -382,6 +384,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		SingleDose:                  drug_dose,
 		ProvincesCode:               provinces_code,
 		IsUse:                       is_user,
+		SumCount:                    sum_count,
+		SumInCount:                  sum_in_count,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -532,7 +532,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	prescribeOne, _ := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
-
+	fmt.Println("prescribeOne23223323232323223320303203200320320w02323232")
 	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
 
 	_, is_project_open_config = service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
@@ -571,6 +571,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	if is_advice_open.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,

controllers/mobile_api_controllers/patient_api_controller.go

@@ -725,24 +725,34 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								prescribing_number_total = count
 							}
 
-							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							if medical.IsUse == 1 {
 								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "3",
+									"msg":    "1",
 									"advice": advice,
 									"ids":    ids,
 								})
 								return
 							}
-							if prescribing_number_total > total {
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "2",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+
+							if medical.IsUse != 1 {
+								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+									c.ServeSuccessJSON(map[string]interface{}{
+										"msg":    "3",
+										"advice": advice,
+										"ids":    ids,
+									})
+									return
+								}
+								if prescribing_number_total > total {
+									c.ServeSuccessJSON(map[string]interface{}{
+										"msg":    "2",
+										"advice": advice,
+										"ids":    ids,
+									})
+									return
+								}
 							}
-							fmt.Println("total23323232323232323232", total)
-							fmt.Println("total23323232323232323232", prescribing_number_total)
+
 							if prescribing_number_total <= total {
 
 								//查询是否出库按钮开启
@@ -826,24 +836,31 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								prescribing_number_total = count
 							}
 
-							fmt.Println("开医嘱数量", prescribing_number_total)
-							fmt.Println("剩余库存", total)
-
-							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							if medical.IsUse == 1 {
 								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "3",
+									"msg":    "1",
 									"advice": advice,
 									"ids":    ids,
 								})
 								return
 							}
-							if prescribing_number_total > total {
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "2",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+							if medical.IsUse != 1 {
+								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+									c.ServeSuccessJSON(map[string]interface{}{
+										"msg":    "3",
+										"advice": advice,
+										"ids":    ids,
+									})
+									return
+								}
+								if prescribing_number_total > total {
+									c.ServeSuccessJSON(map[string]interface{}{
+										"msg":    "2",
+										"advice": advice,
+										"ids":    ids,
+									})
+									return
+								}
 							}
 
 							if prescribing_number_total <= total {
@@ -1121,21 +1138,34 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							prescribing_number_total = count
 						}
 
-						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "3",
-								"advice": advice,
-								"ids":    ids,
-							})
-							return
+						if medical.IsUse == 1 {
+
+							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 						}
-						if prescribing_number_total > total {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "2",
-								"advice": advice,
-								"ids":    ids,
-							})
-							return
+						if medical.IsUse != 1 {
+							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "3",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
+							if prescribing_number_total > total {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 						}
 
 						if prescribing_number_total <= total {

controllers/patient_api_controller.go

@@ -1687,20 +1687,30 @@ func (c *PatientApiController) ExecGroupAdvice() {
 
 			}
 
-			if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+			if medical.IsUse == 1 {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "3",
+					"msg":    "1",
 					"advice": advice,
 				})
 				return
 			}
-			if prescribing_number_total > total {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "2",
-					"advice": advice,
-				})
-				return
+			if medical.IsUse != 1 {
+				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "3",
+						"advice": advice,
+					})
+					return
+				}
+				if prescribing_number_total > total {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "2",
+						"advice": advice,
+					})
+					return
+				}
 			}
+
 			if prescribing_number_total <= total {
 				if medical.IsUse == 2 {
 					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
@@ -1891,20 +1901,31 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					prescribing_number_total = count
 				}
 
-				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "3",
-						"advice": advice,
-					})
-					return
+				if medical.IsUse != 1 {
+					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+						})
+						return
+					}
+					if prescribing_number_total > total {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "2",
+							"advice": advice,
+						})
+						return
+					}
 				}
-				if prescribing_number_total > total {
+
+				if medical.IsUse == 1 {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "2",
+						"msg":    "1",
 						"advice": advice,
 					})
 					return
 				}
+
 				if prescribing_number_total <= total {
 
 					//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
@@ -1914,7 +1935,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if adviceSetting.IsAdviceOpen == 1 {
 						//查询是否出库按钮开启
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
-						fmt.Println("prescriptionConfigwodweweeeweweweweweewewewwewew", prescriptionConfig.IsOpen)
+
 						if prescriptionConfig.IsOpen == 1 {
 							if medical.IsUse == 2 {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
@@ -2135,7 +2156,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("h2h332o2o23o32o32o32oo32o23o23o23o23o23o32o23o232o3wode", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctorsTwo(adminUserInfo.CurrentOrgId, patient, id)
@@ -2207,26 +2228,34 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 					}
 
-					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+					if medical.IsUse == 1 {
 						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "3",
+							"msg":    "1",
 							"advice": advice,
 						})
 						return
 					}
-					fmt.Println("prescribing_number_totalwodeeeeeeeeeeeeee", prescribing_number_total)
-					fmt.Println("total3233332323223322323322323", total)
-					if prescribing_number_total > total {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "2",
-							"advice": advice,
-						})
-						return
+					if medical.IsUse != 1 {
+						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": advice,
+							})
+							return
+						}
+
+						if prescribing_number_total > total {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": advice,
+							})
+							return
+						}
 					}
 
 					if prescribing_number_total <= total {
 						if medical.IsUse == 2 {
-							fmt.Println("config233232323232232333223232332323233223322232wode", config.IsOpen)
+
 							if config.IsOpen != 1 {
 								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
 								//查询默认仓库

models/his_charge_models.go

@@ -88,21 +88,22 @@ func (SettlePatient) TableName() string {
 }
 
 type HisChargeOrder struct {
-	ID                 int64                 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId       int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Status             int64                 `gorm:"column:status" json:"status" form:"status"`
-	Number             string                `gorm:"column:number" json:"number" form:"number"`
-	OrderStatus        int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId            string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HifesPay           float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	MafPay             float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	FundPaySumamt      float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	AcctPay            float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay         float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HisChargeOrderInfo []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+	ID                  int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId        int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate  int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Status              int64                 `gorm:"column:status" json:"status" form:"status"`
+	Number              string                `gorm:"column:number" json:"number" form:"number"`
+	OrderStatus         int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId             string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	PatientId           int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HifesPay            float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	MafPay              float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	FundPaySumamt       float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	AcctPay             float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay          float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	IsMedicineInsurance int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	HisChargeOrderInfo  []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
 }
 
 func (HisChargeOrder) TableName() string {

service/his_service.go

@@ -775,6 +775,7 @@ type BaseDrugLib struct {
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`

service/his_summary_service.go

@@ -9,7 +9,7 @@ import (
 func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
 
 	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt").
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt,is_medicine_insurance").
 			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("status = 1").
 					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {

service/mobile_dialysis_service.go

@@ -2150,7 +2150,7 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
-
+	fmt.Println("key23322323232323", key)
 	dialysis_prescribe_str, _ := redis.Get(key).Result()
 
 	if len(dialysis_prescribe_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/stock_service.go

@@ -4341,7 +4341,7 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
 	return out, err
 
 }
@@ -4776,7 +4776,7 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,x.ctime,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }