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

controllers/his_api_controller.go

@@ -98,6 +98,318 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/test/get", &HisApiController{}, "get:GetTestOrder")
 
+	beego.Router("/api/batch/settleaccount", &HisApiController{}, "get:GetBatchSettleAccounts")
+
+}
+
+func (c *HisApiController) GetBatchSettleAccounts() {
+	order_ids := c.GetString("order_ids")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	orders := strings.Split(order_ids, ",")
+	var newOrders []models.Orders
+	for _, item := range orders {
+		order, _ := service.GetHisOrderByIDTenOne(item)
+		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+		orderInfos, _ := service.GetHisOrderInfoByNumberOne(order.Number)
+		orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
+		orderInfos = append(orderInfos, orderInfos_two...)
+		his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+		//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+		var diagnosis_ids []string
+		if his.ID > 0 {
+			diagnosis_ids = strings.Split(his.Diagnosis, ",")
+
+		} else {
+			diagnosis_ids = strings.Split(his_hospital.Diagnosis, ",")
+
+		}
+		patient, _ := service.GetPatientByIDTenTwo(adminUser.CurrentOrgId, order.PatientId)
+		var dia_config []*models.HisXtDiagnoseConfig
+		var name string
+		for _, item := range diagnosis_ids {
+			id, _ := strconv.ParseInt(item, 10, 64)
+			diagnosisConfig, _ := service.FindDiagnoseById(id)
+			dia_config = append(dia_config, diagnosisConfig)
+			if len(name) == 0 {
+				name = diagnosisConfig.ClassName
+
+			} else {
+				name = name + "," + diagnosisConfig.ClassName
+			}
+		}
+
+		var bedCostTotal float64 = 0         //床位总费
+		var bedCostSelfTotal float64 = 0     //床位自费
+		var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+		var bedSelfTotal float64 = 0         //床位部分项目自费
+		var bedInscpTotal float64 = 0        //床位部分项目自费
+
+		var operationCostTotal float64 = 0         //手术费
+		var operationCostSelfTotal float64 = 0     //手术费
+		var operationCostPartSelfTotal float64 = 0 //手术费
+		var operationSelfTotal float64 = 0         //床位部分项目自费
+		var operationInscpTotal float64 = 0        //床位部分项目自费
+
+		var otherCostTotal float64 = 0         //其他费用
+		var otherCostSelfTotal float64 = 0     //其他费用
+		var otherCostPartSelfTotal float64 = 0 //其他费用
+		var otherSelfTotal float64 = 0         //床位部分项目自费
+		var otherInscpTotal float64 = 0        //床位部分项目自费
+
+		var materialCostTotal float64 = 0         //材料费
+		var materialCostSelfTotal float64 = 0     //材料费
+		var materialCostPartSelfTotal float64 = 0 //材料费
+		var materialSelfTotal float64 = 0         //床位部分项目自费
+		var materialInscpTotal float64 = 0        //床位部分项目自费
+
+		var westernMedicineCostTotal float64 = 0         //西药费
+		var westernMedicineCostSelfTotal float64 = 0     //西药费
+		var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+		var westernMedicineSelfTotal float64 = 0         //床位部分项目自费
+		var westernMedicineInscpTotal float64 = 0        //床位部分项目自费
+
+		var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+		var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+		var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+		var chineseTraditionalSelfTotal float64 = 0                 //床位部分项目自费
+		var chineseTraditionalInscpTotal float64 = 0                //床位部分项目自费
+
+		var checkCostTotal float64 = 0         //检查费
+		var checkCostSelfTotal float64 = 0     //检查费
+		var checkCostPartSelfTotal float64 = 0 //检查费
+		var checkSelfTotal float64 = 0         //床位部分项目自费
+		var checkInscpTotal float64 = 0        //床位部分项目自费
+
+		var laboratoryCostTotal float64 = 0         //化验费
+		var laboratoryCostSelfTotal float64 = 0     //化验费
+		var laboratoryCostPartSelfTotal float64 = 0 //化验费
+		var laboratorySelfTotal float64 = 0         //床位部分项目自费
+		var laboratoryInscpTotal float64 = 0        //床位部分项目自费
+
+		var treatCostTotal float64 = 0         //治疗费用
+		var treatCostSelfTotal float64 = 0     //治疗费用
+		var treatCostPartSelfTotal float64 = 0 //治疗费用
+		var treatSelfTotal float64 = 0         //床位部分项目自费
+		var treatInscpTotal float64 = 0        //床位部分项目自费
+
+		decimal.DivisionPrecision = 2
+
+		for _, item := range orderInfos {
+			if item.MedChrgitmType == "01" { //床位费
+				bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				bedSelfTotal, _ = decimal.NewFromFloat(bedSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				bedInscpTotal, _ = decimal.NewFromFloat(bedInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+				if item.MedChrgitmType == "03" { //检查费
+					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+					laboratorySelfTotal, _ = decimal.NewFromFloat(laboratorySelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+					laboratoryInscpTotal, _ = decimal.NewFromFloat(laboratoryInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+				}
+			} else {
+
+				if item.MedChrgitmType == "03" { //检查费
+					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+					checkSelfTotal, _ = decimal.NewFromFloat(checkSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+					checkInscpTotal, _ = decimal.NewFromFloat(checkInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+				}
+
+			}
+
+			if item.MedChrgitmType == "04" { //化验费
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				laboratorySelfTotal, _ = decimal.NewFromFloat(laboratorySelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				laboratoryInscpTotal, _ = decimal.NewFromFloat(laboratoryInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+
+				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				treatSelfTotal, _ = decimal.NewFromFloat(treatSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				treatInscpTotal, _ = decimal.NewFromFloat(treatInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "06" { //手术费
+				operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				operationSelfTotal, _ = decimal.NewFromFloat(operationSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				operationInscpTotal, _ = decimal.NewFromFloat(operationInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "08" { //材料费
+				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				materialSelfTotal, _ = decimal.NewFromFloat(materialSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				materialInscpTotal, _ = decimal.NewFromFloat(materialInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "09" { //西药费
+				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				westernMedicineSelfTotal, _ = decimal.NewFromFloat(westernMedicineSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				westernMedicineInscpTotal, _ = decimal.NewFromFloat(westernMedicineInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "11" { //中成费
+				chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				chineseTraditionalSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				chineseTraditionalInscpTotal, _ = decimal.NewFromFloat(chineseTraditionalInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				otherSelfTotal, _ = decimal.NewFromFloat(otherSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				otherInscpTotal, _ = decimal.NewFromFloat(otherInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+		}
+
+		miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+		printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+		charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
+
+		doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, his_hospital.Doctor)
+
+		roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+
+		var doctor_name string
+		if roles.ID == 0 {
+			doctor_name = "管理员"
+		} else {
+			doctor_name = roles.UserName
+		}
+
+		yiliao_leibie := ""
+
+		switch order.MedType {
+		case "11":
+			yiliao_leibie = "普通门诊"
+			break
+		case "12":
+			yiliao_leibie = "门诊挂号"
+			break
+		case "13":
+			yiliao_leibie = "急诊"
+			break
+		case "14":
+			yiliao_leibie = "门诊特殊病"
+			break
+		case "15":
+			yiliao_leibie = "门诊统筹"
+			break
+		case "16":
+			yiliao_leibie = "门诊慢性病"
+			break
+		case "21":
+			yiliao_leibie = "普通住院"
+			break
+		}
+		var newOrder models.Orders
+
+		newOrder.Diagnosis = name
+		newOrder.OrderInfos = orderInfos
+		newOrder.Number = order.MdtrtId
+		newOrder.Date = order.SettleAccountsDate
+		newOrder.ChargeAdmin = charge_admin
+		newOrder.PrintorAdmin = printor_admin
+		newOrder.Order = order
+		newOrder.BedCostTotal = bedCostTotal
+		newOrder.BedCostSelfTotal = bedCostSelfTotal
+		newOrder.BedCostPartSelfTotal = bedCostPartSelfTotal
+		newOrder.BedSelfTotal = bedSelfTotal
+		newOrder.BedInscpTotal = bedInscpTotal
+		newOrder.OperationCostTotal = operationCostTotal
+		newOrder.OperationCostSelfTotal = operationCostSelfTotal
+		newOrder.OperationCostPartSelfTotal = operationCostPartSelfTotal
+		newOrder.OperationSelfTotal = operationSelfTotal
+		newOrder.OperationInscpTotal = operationInscpTotal
+		newOrder.OtherCostTotal = otherCostTotal
+		newOrder.OtherCostSelfTotal = otherCostSelfTotal
+		newOrder.OtherCostPartSelfTotal = otherCostPartSelfTotal
+		newOrder.OtherSelfTotal = otherSelfTotal
+		newOrder.OtherInscpTotal = otherInscpTotal
+
+		newOrder.MaterialCostTotal = materialCostTotal
+		newOrder.MaterialCostSelfTotal = materialCostSelfTotal
+		newOrder.MaterialCostPartSelfTotal = materialCostPartSelfTotal
+		newOrder.MaterialSelfTotal = materialSelfTotal
+		newOrder.MaterialInscpTotal = materialInscpTotal
+
+		newOrder.WesternMedicineCostTotal = westernMedicineCostTotal
+		newOrder.WesternMedicineCostSelfTotal = westernMedicineCostSelfTotal
+		newOrder.WesternMedicineCostPartSelfTotal = westernMedicineCostPartSelfTotal
+		newOrder.WesternMedicineSelfTotal = westernMedicineSelfTotal
+		newOrder.WesternMedicineInscpTotal = westernMedicineInscpTotal
+
+		newOrder.ChineseTraditionalMedicineCostTotal = chineseTraditionalMedicineCostTotal
+		newOrder.ChineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostSelfTotal
+		newOrder.ChineseTraditionalMedicineCostPartSelfTotal = chineseTraditionalMedicineCostPartSelfTotal
+		newOrder.ChineseTraditionalSelfTotal = chineseTraditionalSelfTotal
+		newOrder.ChineseTraditionalInscpTotal = chineseTraditionalInscpTotal
+
+		newOrder.CheckCostTotal = checkCostTotal
+		newOrder.CheckCostSelfTotal = checkCostSelfTotal
+		newOrder.CheckCostPartSelfTotal = checkCostPartSelfTotal
+		newOrder.CheckSelfTotal = checkSelfTotal
+		newOrder.CheckInscpTotal = checkInscpTotal
+
+		newOrder.LaboratoryCostTotal = laboratoryCostTotal
+		newOrder.LaboratoryCostSelfTotal = laboratoryCostSelfTotal
+		newOrder.LaboratoryCostPartSelfTotal = laboratoryCostPartSelfTotal
+		newOrder.LaboratorySelfTotal = laboratorySelfTotal
+		newOrder.LaboratoryInscpTotal = laboratoryInscpTotal
+
+		newOrder.TreatCostTotal = treatCostTotal
+		newOrder.TreatCostSelfTotal = treatCostSelfTotal
+		newOrder.TreatCostPartSelfTotal = treatCostPartSelfTotal
+		newOrder.TreatSelfTotal = treatSelfTotal
+		newOrder.TreatInscpTotal = treatInscpTotal
+
+		newOrder.DoctorInfo = doctor_info
+		newOrder.DoctorName = doctor_name
+		newOrder.HealthCardNo = order.PsnNo
+		newOrder.YiliaoLeibie = yiliao_leibie
+		newOrder.Patient = patient
+		newOrder.OrgName = miConfig.OrgName
+		newOrder.OrgCode = miConfig.Code
+		newOrder.OrderNumber = order.Number
+		newOrder.HisPatient = his
+		newOrder.DiaConfig = dia_config
+
+		newOrders = append(newOrders, newOrder)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"orders": newOrders,
+	})
 }
 
 func (c *HisApiController) GetTestOrder() {
@@ -5569,7 +5881,7 @@ func (c *HisApiController) setAdviceTemplateWithJSON(advice *models.HisPrescript
 		day := int64(json["day"].(float64))
 		advice.Day = day
 	}
-
+	advice.FrequencyType = 1
 	return 0
 }
 
@@ -5624,6 +5936,8 @@ func (c *HisApiController) setProjectTemplateWithJSON(project *models.HisPrescri
 		unit, _ := json["unit"].(string)
 		project.Unit = unit
 	}
+	project.FrequencyType = 1
+
 	return 0
 }
 
@@ -5637,6 +5951,8 @@ func (c *HisApiController) GetHisOrderList() {
 	p_type, _ := c.GetInt64("p_type", 0)
 	sort_type, _ := c.GetInt64("sort_type", 0)
 	charge_type, _ := c.GetInt64("charge_type", 0)
+	sch_type, _ := c.GetInt64("sch_type", 0)
+	zone_type, _ := c.GetInt64("zone_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -5663,7 +5979,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
@@ -6205,12 +6521,6 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_ways := c.GetString("pay_ways")
 
-	cash_pay := c.GetString("cash_pay")
-	band_card_pay := c.GetString("band_card_pay")
-	wechat_pay := c.GetString("wechat_pay")
-	ali_pay := c.GetString("ali_pay")
-	jifen_pay := c.GetString("jifen_pay")
-
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 	discount_price, _ := c.GetFloat("discount_price")
@@ -6231,6 +6541,12 @@ func (c *HisApiController) GetUploadInfo() {
 	reg_type, _ := c.GetInt64("p_type")
 	order_id, _ := c.GetInt64("order_id")
 
+	cash_pay := c.GetString("cash_pay")
+	wechat_pay := c.GetString("wechat_pay")
+	ali_pay := c.GetString("ali_pay")
+	jifen_pay := c.GetString("jifen_pay")
+	band_card_pay := c.GetString("band_card_pay")
+
 	dec_way := c.GetString("dec_way") //是否使用押金支付bool类型
 	tmp_decimal := c.GetString("tmp_decimal")
 	var decimal float64 //本次使用的押金
@@ -6258,10 +6574,7 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 	tt, errs := strconv.ParseFloat(tmp_decimal, 64)
 	fmt.Println(errs)
-	//if errs != nil {
-	//	c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
-	//	return
-	//}
+
 	decimal = tt
 
 	his, _ := service.GetHisPatientByIdThreeTX(his_patient_id, tx)
@@ -6828,232 +7141,8 @@ func (c *HisApiController) GetUploadInfo() {
 			})
 
 		}
-	} else {
-		if tempOrder.IsPre > 0 {
-			allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
-			totals, _ := strconv.ParseFloat(allTotal, 64)
-			tempOrder.OrderStatus = 2
-			tempOrder.PayWay = pay_way
-			tempOrder.PayPrice = pay_price
-			tempOrder.PayCardNo = pay_card_no
-			tempOrder.DiscountPrice = discount_price
-			tempOrder.PreferentialPrice = preferential_price
-			tempOrder.RealityPrice = reality_price
-			tempOrder.FoundPrice = found_price
-			tempOrder.MedicalInsurancePrice = medical_insurance_price
-			tempOrder.PrivatePrice = private_price
-			tempOrder.FaPiaoCode = fapiao_code
-			tempOrder.FaPiaoNumber = fapiao_number
-			tempOrder.PType = 2
-			tempOrder.MedfeeSumamt = totals
-			tempOrder.Diagnosis = diagnosis_id
-			err = service.SaveHisOrder(&tempOrder)
-			err = service.UpdataOrderStatusTwo(tempOrder.Number, adminUser.CurrentOrgId)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
-				return
-			}
-			if err == nil {
-				houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
-				var goods []*models.DialysisBeforePrepareGoods
-				var newGoods []*models.NewDialysisBeforePrepareGoods
-				var infos []*models.HisDoctorAdviceInfo
-				var hisAdvice []*models.HisDoctorAdviceInfo
-				var newGoodOne []*models.NewDialysisBeforePrepareGoods
-				var infolist []*models.HisDoctorAdviceInfo
-				var oldGoods []*models.OldDialysisBeforePrepareGoods
-				for _, info := range prescriptions {
-					if info.Type == 1 {
-						infos = append(infos, info.HisDoctorAdviceInfo...)
-					}
-					if info.Type == 2 {
-						for _, sumItem := range info.HisPrescriptionProject {
-							if sumItem.Type == 3 {
-								var good models.DialysisBeforePrepareGoods
-								var newGood models.NewDialysisBeforePrepareGoods
-								good.GoodId = sumItem.GoodInfo.ID
-								good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-								count, _ := strconv.Atoi(sumItem.Count)
-								good.Count = int64(count)
-								good.StorehouseId = houseConfig.StorehouseOutInfo
-								good.ProjectId = sumItem.ID
-								goods = append(goods, &good)
-
-								newGood.GoodId = sumItem.GoodInfo.ID
-								newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-								count2, _ := strconv.Atoi(sumItem.Count)
-								newGood.Count = int64(count2)
-								newGood.StorehouseId = houseConfig.StorehouseOutInfo
-								newGood.ProjectId = sumItem.ID
-								newGoods = append(newGoods, &newGood)
-							}
-
-						}
-
-					}
-				}
-
-				settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
-				if settConfig.IsOpen == 1 {
-
-					//判断库存的地方
-					for _, info := range prescriptions {
-						if info.Type == 1 {
-							infolist = append(infolist, info.HisDoctorAdviceInfo...)
-
-						}
-						if info.Type == 2 {
-							for _, sumItem := range info.HisPrescriptionProject {
-								if sumItem.Type == 3 {
-									var good models.DialysisBeforePrepareGoods
-									var newGood models.NewDialysisBeforePrepareGoods
-									var oldGood models.OldDialysisBeforePrepareGoods
-									good.GoodId = sumItem.GoodInfo.ID
-									good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count, _ := strconv.Atoi(sumItem.Count)
-									good.Count = int64(count)
-									good.StorehouseId = houseConfig.StorehouseOutInfo
-									good.ProjectId = sumItem.ID
-									goods = append(goods, &good)
-
-									newGood.GoodId = sumItem.GoodInfo.ID
-									newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count2, _ := strconv.Atoi(sumItem.Count)
-									newGood.Count = int64(count2)
-									newGood.StorehouseId = houseConfig.StorehouseOutInfo
-									newGood.ProjectId = sumItem.ID
-									newGoods = append(newGoods, &newGood)
-
-									oldGood.GoodId = sumItem.GoodInfo.ID
-									oldGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count3, _ := strconv.Atoi(sumItem.Count)
-									oldGood.Count = int64(count3)
-									oldGood.StorehouseId = houseConfig.StorehouseOutInfo
-									oldGood.ProjectId = sumItem.ID
-									oldGood.RecordDate = sumItem.RecordDate
-
-									oldGoods = append(oldGoods, &oldGood)
-								}
-							}
-						}
-					}
-
-					for _, info := range prescriptionsOne {
-						if info.Type == 1 {
-							hisAdvice = append(hisAdvice, info.HisDoctorAdviceInfo...)
-						}
-
-						if info.Type == 2 {
-							for _, sumItem := range info.HisPrescriptionProject {
-								if sumItem.Type == 3 {
-									var newGood models.NewDialysisBeforePrepareGoods
-
-									newGood.GoodId = sumItem.GoodInfo.ID
-									newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count2, _ := strconv.Atoi(sumItem.Count)
-									newGood.Count = int64(count2)
-									newGood.StorehouseId = houseConfig.StorehouseOutInfo
-									newGood.ProjectId = sumItem.ID
-									newGoodOne = append(newGoodOne, &newGood)
-								}
-							}
-						}
-					}
-
-					//判断
-					for _, itemOne := range infos {
-						for _, itemTwo := range hisAdvice {
-							if itemOne.DrugId == itemTwo.DrugId {
-								itemTwo.Child = append(itemTwo.ChildDoctorAdvice, itemOne)
-							}
-						}
-					}
-
-					for _, itemTwo := range hisAdvice {
-						medical, _ := service.GetBaseDrugMedical(itemTwo.DrugId)
-						var sum_out_count int64
-						for _, itemThree := range itemTwo.Child {
-							var prescribing_number int64
-							stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
-							parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
-							if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-								prescribing_number = parseIntPrescribingNumber * medical.MinNumber
-							}
-							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-								prescribing_number = parseIntPrescribingNumber
-							}
-							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
-								prescribing_number = parseIntPrescribingNumber
-							}
-							sum_out_count += prescribing_number
-						}
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
-						drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId, houseConfig.DrugStorehouseOut)
-
-						if sum_out_count > drugStockOut.FlushCount {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":  "2",
-								"drug": medical,
-							})
-							return
-						}
-					}
-
-					for _, itemOne := range newGoods {
-						for _, item := range newGoodOne {
-							if itemOne.ProjectId == item.ProjectId {
-								item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, item)
-							}
-						}
-					}
-
-					for _, item := range newGoodOne {
-						var sum_out_count_one int64
-						good, _ := service.GetGoodInformationByGoodIdOne(item.GoodId)
-
-						for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
-							sum_out_count_one += itemOne.Count
-						}
-						list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
-						fmt.Println("sum_out_count_one", sum_out_count_one)
-						fmt.Println("list.FlushCount", list.FlushCount)
-						if sum_out_count_one > list.FlushCount {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":  "3",
-								"good": good,
-							})
-							return
-						}
-					}
-					for _, item := range infolist {
-						service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
-					}
-					for _, item := range oldGoods {
-						dialyPrepareOne := models.DialysisBeforePrepare{
-							GoodTypeId:   item.GoodTypeId,
-							GoodId:       item.GoodId,
-							PatientId:    item.PatientId,
-							RecordDate:   item.RecordDate,
-							UserOrgId:    item.UserOrgId,
-							Count:        item.Count,
-							Ctime:        time.Now().Unix(),
-							Creater:      adminUser.AdminUser.Id,
-							CommdityCode: item.CommdityCode,
-							Status:       1,
-							StorehouseId: houseConfig.StorehouseOutInfo,
-						}
-						err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
-					}
-
-					service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
-				}
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "结算成功",
-				})
-			}
-		}
 	}
+
 }
 
 // 退款
@@ -9188,96 +9277,198 @@ func (c *HisApiController) CreateHisPrescriptionTemplate() {
 		return
 	}
 
-	err = service.CreateHisPrescriptionTemplate(template)
-	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-		if len(prescriptions) > 0 {
-			for _, item := range prescriptions {
-				items := item.(map[string]interface{})
-				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
-					utils.ErrorLog("type")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				types := int64(items["type"].(float64))
+	template_one, _ := service.GetHisPrescriptionTemplateByModeId(mode_id, patient_id, c.GetAdminUserInfo().CurrentOrgId)
 
-				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
-					utils.ErrorLog("med_type")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				med_type := strconv.Itoa(int(items["med_type"].(float64)))
+	//如果已经存在记录则删除处方
+	if template_one.ID > 0 {
+		ps, _ := service.GetHisPrescriptionInfoTemplates(template_one.ID, template_one.UserOrgId)
+		for _, item := range ps {
+			service.DelelteHisPrescriptionInfoTemplate(item.ID, item.UserOrgId)
+		}
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+						utils.ErrorLog("type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					types := int64(items["type"].(float64))
 
-				ctime := time.Now().Unix()
-				prescription := &models.HisPrescriptionInfoTemplate{
-					PatientId:   patient_id,
-					UserOrgId:   adminInfo.CurrentOrgId,
-					Ctime:       ctime,
-					Mtime:       ctime,
-					Type:        types,
-					Modifier:    adminInfo.AdminUser.Id,
-					Creator:     adminInfo.AdminUser.Id,
-					Status:      1,
-					PTemplateId: template.ID,
-					MedType:     med_type,
-				}
-				service.CreateHisPrescriptionInfoTemplate(prescription)
+					if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+						utils.ErrorLog("med_type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					med_type := strconv.Itoa(int(items["med_type"].(float64)))
 
-				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-					advices := items["advices"].([]interface{})
-					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 					ctime := time.Now().Unix()
-					mtime := ctime
-					if len(advices) > 0 {
-						for _, advice := range advices {
-							var s models.HisPrescriptionAdviceTemplate
-							s.PrescriptionId = prescription.ID
-							s.AdviceType = 2
-							s.StopState = 2
-							s.ExecutionState = 2
-							s.Status = 1
-							s.UserOrgId = adminInfo.CurrentOrgId
-							s.CreatedTime = ctime
-							s.UpdatedTime = mtime
-							s.PatientId = patient_id
-							errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
-							}
+					prescription := &models.HisPrescriptionInfoTemplate{
+						PatientId:   patient_id,
+						UserOrgId:   adminInfo.CurrentOrgId,
+						Ctime:       ctime,
+						Mtime:       ctime,
+						Type:        types,
+						Modifier:    adminInfo.AdminUser.Id,
+						Creator:     adminInfo.AdminUser.Id,
+						Status:      1,
+						PTemplateId: template_one.ID,
+						MedType:     med_type,
+					}
+					service.CreateHisPrescriptionInfoTemplate(prescription)
 
-							service.CreateHisPrescriptionAdviceTemplate(&s)
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+						ctime := time.Now().Unix()
+						mtime := ctime
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var s models.HisPrescriptionAdviceTemplate
+								s.PrescriptionId = prescription.ID
+								s.AdviceType = 2
+								s.StopState = 2
+								s.ExecutionState = 2
+								s.Status = 1
+								s.UserOrgId = adminInfo.CurrentOrgId
+								s.CreatedTime = ctime
+								s.UpdatedTime = mtime
+								s.PatientId = patient_id
+								errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+
+								service.CreateHisPrescriptionAdviceTemplate(&s)
 
+							}
 						}
 					}
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+							for _, project := range projects {
+								var p models.HisPrescriptionProjectTemplate
+								p.PrescriptionId = prescription.ID
+								p.Ctime = time.Now().Unix()
+								p.Mtime = time.Now().Unix()
+								p.PatientId = patient_id
+								p.UserOrgId = adminInfo.CurrentOrgId
+								p.Status = 1
+								errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+								service.CreateHisPrescriptionProjectTemplate(&p)
+
+							}
+						}
+					}
+
 				}
-				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-					projects := items["project"].([]interface{})
-					if len(projects) > 0 {
-						for _, project := range projects {
-							var p models.HisPrescriptionProjectTemplate
-							p.PrescriptionId = prescription.ID
-							p.Ctime = time.Now().Unix()
-							p.Mtime = time.Now().Unix()
-							p.PatientId = patient_id
-							p.UserOrgId = adminInfo.CurrentOrgId
-							p.Status = 1
-							errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "创建成功",
+				})
+			}
+		}
+
+	} else {
+		err = service.CreateHisPrescriptionTemplate(template)
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+						utils.ErrorLog("type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					types := int64(items["type"].(float64))
+
+					if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+						utils.ErrorLog("med_type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					med_type := strconv.Itoa(int(items["med_type"].(float64)))
+
+					ctime := time.Now().Unix()
+					prescription := &models.HisPrescriptionInfoTemplate{
+						PatientId:   patient_id,
+						UserOrgId:   adminInfo.CurrentOrgId,
+						Ctime:       ctime,
+						Mtime:       ctime,
+						Type:        types,
+						Modifier:    adminInfo.AdminUser.Id,
+						Creator:     adminInfo.AdminUser.Id,
+						Status:      1,
+						PTemplateId: template.ID,
+						MedType:     med_type,
+					}
+					service.CreateHisPrescriptionInfoTemplate(prescription)
+
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+						ctime := time.Now().Unix()
+						mtime := ctime
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var s models.HisPrescriptionAdviceTemplate
+								s.PrescriptionId = prescription.ID
+								s.AdviceType = 2
+								s.StopState = 2
+								s.ExecutionState = 2
+								s.Status = 1
+								s.UserOrgId = adminInfo.CurrentOrgId
+								s.CreatedTime = ctime
+								s.UpdatedTime = mtime
+								s.PatientId = patient_id
+								errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+
+								service.CreateHisPrescriptionAdviceTemplate(&s)
+
 							}
-							service.CreateHisPrescriptionProjectTemplate(&p)
+						}
+					}
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+							for _, project := range projects {
+								var p models.HisPrescriptionProjectTemplate
+								p.PrescriptionId = prescription.ID
+								p.Ctime = time.Now().Unix()
+								p.Mtime = time.Now().Unix()
+								p.PatientId = patient_id
+								p.UserOrgId = adminInfo.CurrentOrgId
+								p.Status = 1
+								errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+								service.CreateHisPrescriptionProjectTemplate(&p)
 
+							}
 						}
 					}
+
 				}
 
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "创建成功",
+				})
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "创建成功",
-			})
 		}
 	}
 

controllers/his_charge_api_controller.go

@@ -299,6 +299,7 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 	is_print, _ := c.GetInt64("is_print")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	tube_color, _ := c.GetInt64("tube_color")
 
 	adminUser := c.GetAdminUserInfo()
 
@@ -309,7 +310,21 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 
 	}
 	record_time := startTime.Unix()
-	labels, total, err := service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword)
+	var labels []*models.HisLabelPrintInfo
+	var labels_two []*models.HisLabelPrintInfo
+
+	var total int64
+	var total_two int64
+	//var err error
+	if tube_color == 0 {
+		labels, total, err = service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+	} else {
+		labels, total, err = service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+		labels_two, total_two, err = service.GetLabelPrintListTwo(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+		total = total + total_two
+		labels = append(labels, labels_two...)
+	}
+
 	if err == nil {
 
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -674,7 +674,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
 				evaluation.Remark = lastPredialysisEvaluation.Remark
 				if adminUserInfo.Org.Id == 10318 {
-					evaluation.Remark = "患者已确认无发热，无流行病学接触史"
+					evaluation.Remark = ""
 				}
 				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {
 					evaluation.BreathingRate = "20"

controllers/mobile_api_controllers/patient_api_controller.go

@@ -701,7 +701,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if isHasWay {
 					var total int64
 					var prescribing_number_total int64
-					fmt.Println("advicesssssssssssssssss", len(advices))
+
 					for _, item := range advices {
 						if item.Way == 1 {
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1132,6 +1132,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 					if total_count == drug_count {
+
 						advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "1",
@@ -1170,7 +1171,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if medical.IsUse == 1 {
-
+							drugError := models.XtDrugError{
+								UserOrgId:  adminInfo.Org.Id,
+								DrugId:     item.DrugId,
+								RecordDate: item.AdviceDate,
+								PatientId:  item.PatientId,
+								Remark:     "零用药品",
+								Status:     1,
+								Ctime:      time.Now().Unix(),
+								Mtime:      0,
+							}
+							service.CreateDrugError(drugError)
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
@@ -1181,6 +1192,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 						if medical.IsUse != 1 {
+							drugError := models.XtDrugError{
+								UserOrgId:  adminInfo.Org.Id,
+								DrugId:     item.DrugId,
+								RecordDate: item.AdviceDate,
+								PatientId:  item.PatientId,
+								Remark:     "药品库存不足",
+								Status:     1,
+								Ctime:      time.Now().Unix(),
+								Mtime:      0,
+							}
+							service.CreateDrugError(drugError)
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "3",
@@ -1190,6 +1212,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								return
 							}
 							if prescribing_number_total > total {
+								drugError := models.XtDrugError{
+									UserOrgId:  adminInfo.Org.Id,
+									DrugId:     item.DrugId,
+									RecordDate: item.AdviceDate,
+									PatientId:  item.PatientId,
+									Remark:     "出库数量大于库存",
+									Status:     1,
+									Ctime:      time.Now().Unix(),
+									Mtime:      0,
+								}
+								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "2",
 									"advice": advice,

controllers/pharmacy_controller.go

@@ -90,7 +90,7 @@ func (this *PharmacyController) TodayNumber() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10215 && orgid != 10387 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
 		//查询表里当天的数据
 		var wtotal int
 		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
@@ -116,7 +116,7 @@ func (this *PharmacyController) TodayNumber() {
 		return
 	}
 
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10215 || orgid == 10387 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
 		var wtotal int
 		var itotal int
 		//查找出库数量
@@ -165,7 +165,7 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10215 {
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
@@ -189,7 +189,7 @@ func (this *PharmacyController) IssuedDrug() {
 		})
 	}
 
-	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10215 {
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
@@ -245,7 +245,7 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10215 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
@@ -269,7 +269,7 @@ func (this *PharmacyController) WaitingDrug() {
 	}
 
 	//当天已发药的人数
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10215 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
@@ -370,7 +370,6 @@ func (this *PharmacyController) DispensingMedicine() {
 		for _, item := range advicelist {
 			//查询改药品信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			//通过药房发药
 			if medical.IsPharmacy == 1 {
 				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
 				//查询该药品是否有库存
@@ -390,8 +389,7 @@ func (this *PharmacyController) DispensingMedicine() {
 					total = list.Count*medical.MinNumber + list.StockMinNumber
 					prescribing_number_total = count
 				}
-				fmt.Println("总库存", total)
-				fmt.Println("出库数量", prescribing_number_total)
+
 				if medical.IsUse != 1 {
 					//如果出库数量大于库存数量
 					if prescribing_number_total > total {
@@ -409,11 +407,29 @@ func (this *PharmacyController) DispensingMedicine() {
 	}
 
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+
+	if orgid == 10387 || orgid == 3877 {
+		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+		if len(advicelist) > 0 {
+			for _, item := range advicelist {
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				if medical.IsPharmacy == 1 {
+					flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
+					if len(flow) > 0 {
+						service.UpdateAdviceFlow(item.ID)
+					}
+				}
+			}
+
+		}
+	}
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": "操作成功",
 	})

controllers/public_api_controller.go

@@ -62,35 +62,35 @@ func PublicApiRegistRouters() {
 	beego.Router("/api/public/handlestockdata", &PublicApiController{}, "get:HandleStockData")
 	beego.Router("/api/public/handlecomdata", &PublicApiController{}, "get:HandleComData")
 	beego.Router("/hello", &PublicApiController{}, "get:HandleComData")
-
 	beego.Router("/handel", &PublicApiController{}, "get:HandleHIS")
-
 	beego.Router("/groupno", &PublicApiController{}, "get:HandleGroupNo")
-
 	beego.Router("/handle10215", &PublicApiController{}, "get:Handle10215")
-
 	beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
-
 	beego.Router("/handelHis", &PublicApiController{}, "get:HandleHisTwo")
-
 	beego.Router("/handelProject", &PublicApiController{}, "get:HandleProject")
-
 	beego.Router("/handelsettledata", &PublicApiController{}, "get:HandleSettleData")
-
 	beego.Router("/handelhispatient", &PublicApiController{}, "get:HandleHisPatient")
-
 	//beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
-
 	beego.Router("/handleExportData", &PublicApiController{}, "get:HandleExportAllData")
-
 	beego.Router("/handleExportData10138", &PublicApiController{}, "get:HandleExportData10138")
 
 	beego.Router("/handleData10265", &PublicApiController{}, "get:HandleData10265")
 
 	beego.Router("/handleData10106", &PublicApiController{}, "get:HandleData10106")
+	beego.Router("/handleData10318", &PublicApiController{}, "get:HandleData10318")
+
+	beego.Router("/handleOne", &PublicApiController{}, "get:HandleOne")
 
 	beego.Router("/handelschedule", &PublicApiController{}, "get:HandleSchedule")
-	beego.Router("/handelscheduleTwo", &PublicApiController{}, "get:HandleScheduleTwo")
+	//beego.Router("/handelscheduleTwo", &PublicApiController{}, "get:HandleScheduleTwo")
+	//
+	//
+	//
+	//beego.Router("/handelhispatienttwo", &PublicApiController{}, "get:HandleHisPatientTwo")
+
+	//beego.Router("/handleorderinfo", &PublicApiController{}, "get:HandleOrderInfoData")
+	//
+	//beego.Router("/hande10138", &PublicApiController{}, "get:HandleOrderInfoData10138")
 
 }
 
@@ -113,41 +113,61 @@ func (c *PublicApiController) HandleSchedule() {
 
 }
 
-func (c *PublicApiController) HandleScheduleTwo() {
-	models, _ := service.GetAllSchMode()
-	for _, item := range models {
-		if item.Mode == 1 {
-			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
-			thisTime := time.Now()
-			_, theWeek := thisTime.ISOWeek()
-			templates[0].Week = theWeek
-			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
-		} else if item.Mode == 2 {
-			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
-			now := time.Now()
-			nextSecWeek := now.AddDate(0, 0, 14)
-			nextWeek := now.AddDate(0, 0, 7)
-			if item.ExecuteTimes%2 == 0 { //下第二周生成的是
-				templates[0].Week = service.GetWeeks(nextWeek.Format("2006-01-02 15:04:05"))
-				templates[1].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
-				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
-				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
-
-			} else if item.ExecuteTimes%2 == 1 {
-				templates[0].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
-				templates[1].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
-				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
-				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
-
-			}
+func (c *PublicApiController) HandleOne() {
+	//fmt.Println("~~~~~~")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
 
-		}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
 	}
-
+	startRecordDateTime := startTime.Unix()
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+	}
+	endRecordDateTime := endTime.Unix()
+	orders, _ := service.GetHisOrderDetailOne(startRecordDateTime, endRecordDateTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": orders,
+	})
 }
 
-func (c *PublicApiController) HandleHisPatient() {
+//func (c *PublicApiController) HandleScheduleTwo() {
+//	models, _ := service.GetAllSchMode()
+//	for _, item := range models {
+//		if item.Mode == 1 {
+//			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
+//			thisTime := time.Now()
+//			_, theWeek := thisTime.ISOWeek()
+//			templates[0].Week = theWeek
+//			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+//		} else if item.Mode == 2 {
+//			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
+//			now := time.Now()
+//			nextSecWeek := now.AddDate(0, 0, 14)
+//			nextWeek := now.AddDate(0, 0, 7)
+//			if item.ExecuteTimes%2 == 0 { //下第二周生成的是
+//				templates[0].Week = service.GetWeeks(nextWeek.Format("2006-01-02 15:04:05"))
+//				templates[1].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+//				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+//				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+//
+//			} else if item.ExecuteTimes%2 == 1 {
+//				templates[0].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+//				templates[1].Week = service.GetWeeks(nextWeek.Format("2006-01-02 15:04:05"))
+//				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+//				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+//
+//			}
+//
+//		}
+//	}
+//
+//}
 
+func (c *PublicApiController) HandleHisPatient() {
 	ps, _ := service.GetHisPatient11111(10215)
 	for _, item := range ps {
 		var rf []*ResultFiveT
@@ -193,7 +213,7 @@ func (c *PublicApiController) HandleHisPatient() {
 		}
 
 		if len(insutypes) == 0 {
-			insutype = "310"
+			insutype = "390"
 		}
 		for _, item := range rf {
 			if item.Insutype == insutype {
@@ -206,6 +226,24 @@ func (c *PublicApiController) HandleHisPatient() {
 	}
 }
 
+//func (c *PublicApiController) HandleHisPatientTwo() {
+//
+//	ps, _ := service.GetHisPatient2222(10188)
+//	for _, item := range ps {
+//		var rf []*ResultFiveT
+//		json.Unmarshal([]byte(item.Iinfo), &rf)
+//		var insuplc_admdvs string
+//
+//		for _, subItem := range rf {
+//			if subItem.Insutype == item.Insutype {
+//				insuplc_admdvs = subItem.InsuplcAdmdvs
+//			}
+//		}
+//		item.InsuplcAdmdvs = insuplc_admdvs
+//		service.SaveHPtWO(item)
+//	}
+//}
+
 func (c *PublicApiController) HandleSettleData() {
 	orders, _ := service.GetHisOrderDetailThree()
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -243,8 +281,6 @@ func (c *PublicApiController) HandleData10106() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 
-	start_time = "2022-11-01"
-	end_time = "2022-11-30"
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -266,6 +302,31 @@ func (c *PublicApiController) HandleData10106() {
 	})
 }
 
+func (c *PublicApiController) HandleData10318() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	fmt.Println(startRecordDateTime)
+	fmt.Println(endRecordDateTime)
+
+	orders, _ := service.GetHisOrderDetail10318(startRecordDateTime, endRecordDateTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": orders,
+	})
+}
+
 func (c *PublicApiController) HandleProject() {
 	prescriptions := service.GetAllProjectPrescription()
 	for _, item := range prescriptions {
@@ -2316,3 +2377,38 @@ func (c *PublicApiController) HandleData10265() {
 	}
 
 }
+
+//func (c *PublicApiController) HandleOrderInfoData() {
+//	orders, _ := service.GetHisOrderInfoDetail()
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"info": orders,
+//	})
+//}
+//
+//func (c *PublicApiController)HandleOrderInfoData10138(){
+//	start_time := c.GetString("start_time")
+//	end_time := c.GetString("end_time")
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+//	if err != nil {
+//
+//	}
+//	startRecordDateTime := startTime.Unix()
+//	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+//	if err != nil {
+//
+//	}
+//	endRecordDateTime := endTime.Unix()
+//	orders, _ := service.GetHisAllPatientOrder(startRecordDateTime,endRecordDateTime)
+//	for _, item := range orders{
+//		for _, subItem := range item.HisOrder10138{
+//			info, _ := service.GetHisOrderInfoDetail10138(subItem.Number)
+//			subItem.VmHisOrderInfo9504 = info
+//		}
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"info": orders,
+//	})
+//
+//}

models/drug_stock.go

@@ -709,3 +709,19 @@ type DrugWarehouseOutInfoNight struct {
 func (DrugWarehouseOutInfoNight) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
+
+type XtDrugError 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"`
+	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Remark     string `gorm:"column:remark" json:"remark" form:"remark"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDrugError) TableName() string {
+	return "xt_drug_error"
+}

models/his_models.go

@@ -1063,8 +1063,7 @@ type HisOrder struct {
 	Patients               Patients               `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient             HisPatient             `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
 	HisHospitalCheckRecord HisHospitalCheckRecord `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_hospital_patient"`
-
-	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
+	HisPrescriptionInfo    HisPrescriptionInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
 
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
@@ -2575,3 +2574,84 @@ type ExportHisPrescription struct {
 func (ExportHisPrescription) TableName() string {
 	return "his_prescription"
 }
+
+type Orders struct {
+	BedCostPartSelfTotal                        float64                `json:"bedCostPartSelfTotal"`
+	BedCostSelfTotal                            float64                `json:"bedCostSelfTotal"`
+	BedCostTotal                                float64                `json:"bedCostTotal"`
+	BedInscpTotal                               float64                `json:"bedInscpTotal"`
+	BedSelfTotal                                float64                `json:"bedSelfTotal"`
+	ChargeAdmin                                 UserAdminRole          `json:"charge_admin"`
+	CheckCostPartSelfTotal                      float64                `json:"checkCostPartSelfTotal"`
+	CheckCostSelfTotal                          float64                `json:"checkCostSelfTotal"`
+	CheckCostTotal                              float64                `json:"checkCostTotal"`
+	CheckInscpTotal                             float64                `json:"checkInscpTotal"`
+	CheckSelfTotal                              float64                `json:"checkSelfTotal"`
+	ChineseTraditionalInscpTotal                float64                `json:"chineseTraditionalInscpTotal"`
+	ChineseTraditionalMedicineCostPartSelfTotal float64                `json:"chineseTraditionalMedicineCostPartSelfTotal"`
+	ChineseTraditionalMedicineCostSelfTotal     float64                `json:"chineseTraditionalMedicineCostSelfTotal"`
+	ChineseTraditionalMedicineCostTotal         float64                `json:"chineseTraditionalMedicineCostTotal"`
+	ChineseTraditionalSelfTotal                 float64                `json:"chineseTraditionalSelfTotal"`
+	Date                                        int64                  `json:"date"`
+	DiaConfig                                   []*HisXtDiagnoseConfig `json:"dia_config"`
+	Diagnosis                                   string                 `json:"diagnosis"`
+	DoctorInfo                                  UserAdminRole          `json:"doctor_info"`
+	DoctorName                                  string                 `json:"doctor_name"`
+	HealthCardNo                                string                 `json:"health_card_no"`
+
+	LaboratoryCostPartSelfTotal      float64            `json:"laboratoryCostPartSelfTotal"`
+	LaboratoryCostSelfTotal          float64            `json:"laboratoryCostSelfTotal"`
+	LaboratoryCostTotal              float64            `json:"laboratoryCostTotal"`
+	LaboratoryInscpTotal             float64            `json:"laboratoryInscpTotal"`
+	LaboratorySelfTotal              float64            `json:"laboratorySelfTotal"`
+	MaterialCostPartSelfTotal        float64            `json:"materialCostPartSelfTotal"`
+	MaterialCostSelfTotal            float64            `json:"materialCostSelfTotal"`
+	MaterialCostTotal                float64            `json:"materialCostTotal"`
+	MaterialInscpTotal               float64            `json:"materialInscpTotal"`
+	MaterialSelfTotal                float64            `json:"materialSelfTotal"`
+	Number                           string             `json:"number"`
+	OperationCostPartSelfTotal       float64            `json:"operationCostPartSelfTotal"`
+	OperationCostSelfTotal           float64            `json:"operationCostSelfTotal"`
+	OperationCostTotal               float64            `json:"operationCostTotal"`
+	OperationInscpTotal              float64            `json:"operationInscpTotal"`
+	OperationSelfTotal               float64            `json:"operationSelfTotal"`
+	Order                            HisOrder           `json:"order"`
+	OrderInfos                       []*HisOrderInfoTwo `json:"order_infos"`
+	OrderNumber                      string             `json:"order_number"`
+	OrgCode                          string             `json:"org_code"`
+	OrgName                          string             `json:"org_name"`
+	OtherCostPartSelfTotal           float64            `json:"otherCostPartSelfTotal"`
+	OtherCostSelfTotal               float64            `json:"otherCostSelfTotal"`
+	OtherCostTotal                   float64            `json:"otherCostTotal"`
+	OtherInscpTotal                  float64            `json:"otherInscpTotal"`
+	OtherSelfTotal                   float64            `json:"otherSelfTotal"`
+	Patient                          PatientTwos        `json:"patient"`
+	PrintorAdmin                     UserAdminRole      `json:"printor_admin"`
+	TreatCostPartSelfTotal           float64            `json:"treatCostPartSelfTotal"`
+	TreatCostSelfTotal               float64            `json:"treatCostSelfTotal"`
+	TreatCostTotal                   float64            `json:"treatCostTotal"`
+	TreatInscpTotal                  float64            `json:"treatInscpTotal"`
+	TreatSelfTotal                   float64            `json:"treatSelfTotal"`
+	WesternMedicineCostPartSelfTotal float64            `json:"westernMedicineCostPartSelfTotal"`
+	WesternMedicineCostSelfTotal     float64            `json:"westernMedicineCostSelfTotal"`
+	WesternMedicineCostTotal         float64            `json:"westernMedicineCostTotal"`
+	WesternMedicineInscpTotal        float64            `json:"westernMedicineInscpTotal"`
+	WesternMedicineSelfTotal         float64            `json:"westernMedicineSelfTotal"`
+	YiliaoLeibie                     string             `json:"yiliao_leibie"`
+	HisPatient                       HisPatient         `json:"his"`
+}
+
+type PatientTwos 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"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Phone        int64  `gorm:"column:phone" json:"phone" form:"phone"`
+	Gender       int64  `gorm:"column:gender" json:"gender" form:"gender"`
+}
+
+func (PatientTwos) TableName() string {
+	return "xt_patients"
+}

service/app_version.go

@@ -353,7 +353,6 @@ type HisPrescriptionInfoTemplateTwo struct {
 func (HisPrescriptionInfoTemplateTwo) TableName() string {
 	return "his_prescription_info_template"
 }
-
 func GetHisPrescriptionTemplateTwo() (prescription []*HisPrescriptionInfoTemplateTwo, err error) {
 	err = readDb.Model(&HisPrescriptionInfoTemplateTwo{}).
 		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
@@ -363,11 +362,9 @@ func GetHisPrescriptionTemplateTwo() (prescription []*HisPrescriptionInfoTemplat
 		Find(&prescription).Error
 	return
 }
-
 func SaveAdviceTemplate(advice HisPrescriptionAdviceTemplate) {
 	writeDb.Save(&advice)
 }
-
 func GetAllPT(org_id int64) (his []*models.HisPrescriptionTemplate, err error) {
 	err = readDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND status = 1", org_id).Find(&his).Error
 	return
@@ -425,7 +422,6 @@ type HisPrescriptionInfoTemplateTHree struct {
 func (HisPrescriptionInfoTemplateTHree) TableName() string {
 	return "his_prescription_info_template"
 }
-
 func GetAllPTInfo(org_id int64, p_template_id int64) (his []*HisPrescriptionInfoTemplateTHree, err error) {
 	err = readDb.Model(&HisPrescriptionInfoTemplateTHree{}).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1")
@@ -434,7 +430,6 @@ func GetAllPTInfo(org_id int64, p_template_id int64) (his []*HisPrescriptionInfo
 	}).Where("user_org_id = ? AND status = 1 AND p_template_id = ?", org_id, p_template_id).Find(&his).Error
 	return
 }
-
 func GetAllInfo(org_id int64, project_id int64) (his []*HisPrescriptionProjectTemplate, err error) {
 	err = readDb.Model(&HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND status = 1 AND project_id = ? ", org_id, project_id).Find(&his).Error
 	return
@@ -443,26 +438,21 @@ func UpdateStatus(project_id int64, p_id int64) {
 	writeDb.Model(&HisPrescriptionProjectTemplate{}).Where("id = ?", project_id).Updates(map[string]interface{}{"status": 0})
 	writeDb.Model(&HisPrescriptionInfoTemplateTwo{}).Where("id = ?", p_id).Updates(map[string]interface{}{"status": 0})
 }
-
 func SaveOrder(order *models.HisOrder) {
 	writeDb.Save(&order)
 }
-
 func GetAllPrivateHis(org_id int64) (his []*models.HisPatient) {
 	readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND balance_accounts_type = 2 AND status = 1", org_id).Find(&his)
 	return
 }
-
 func SaveHis(his *models.HisPatient) {
 	writeDb.Save(his)
 	return
 }
-
 func GetAllProjectPrescription() (pre []*models.HisPrescription) {
 	readDb.Model(&models.HisPrescription{}).Where("user_org_id = 10215 AND status = 1 AND type = 2 AND order_status = 1 AND record_date >= 1659283200").Find(&pre)
 	return
 }
-
 func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 	readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = 10215 AND status = 1 AND project_id = 1735  AND prescription_id = ?", id).Find(&pre)
 	return
@@ -478,7 +468,6 @@ func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 //	}).Find(&order).Error
 //	return
 //}
-
 type HisOrderTen 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"`
@@ -554,13 +543,46 @@ type HisOrderTen struct {
 	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
 	HisPrescriptionTen    []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
-	Patients              Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	//VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"order_info"`
+	VmHisOrderInfo9504 []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+	OthDesc            string                `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays            string                `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+
+	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 }
 
 func (HisOrderTen) TableName() string {
 	return "his_order"
 }
 
+type HisPrescriptionInfoOne 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"`
+	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	SickType           int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PType              int64  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+}
+
+func (HisPrescriptionInfoOne) TableName() string {
+	return "his_prescription_info"
+}
+
 type HisPrescriptionTen 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"`
@@ -582,6 +604,7 @@ type HisPrescriptionTen struct {
 	Patients                  Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisDoctorAdviceInfoTen    []*HisDoctorAdviceInfoTen    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProjectTen []*HisPrescriptionProjectTen `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	HisPrescriptionInfoOne    HisPrescriptionInfoOne       `gorm:"ForeignKey:PrescriptionNumber;AssociationForeignKey:PrescriptionNumber" json:"p_info"`
 	Total                     string                       `gorm:"-" json:"total" form:"total"`
 	PType                     int64                        `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	MedType                   string                       `gorm:"column:med_type" json:"med_type" form:"med_type"`
@@ -591,43 +614,83 @@ type HisPrescriptionTen struct {
 func (HisPrescriptionTen) TableName() string {
 	return "his_prescription"
 }
-
 func GetHisOrderDetailThree() (order []*HisOrderTen, err error) {
-	err = readDb.Model(&HisOrderTen{}).Preload("Patients", "status = 1").Preload("HisPrescriptionTen", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&HisOrderTen{}).Preload("VmHisOrderInfo9504", "status = 1").Preload("Patients", "status = 1").Preload("HisPrescriptionTen", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject", "status = 1").Preload("VMGoodInfo", "status = 1")
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("Drug", "status = 1")
 		})
-	}).Where("settle_accounts_date >= 1659283200 AND settle_accounts_date <= 1661788800 AND status = 1 AND order_status =2 and p_type = 1 AND user_org_id = 10215").Find(&order).Order("patient_id").Error
+	}).Where("settle_accounts_date >= 1675180800 AND settle_accounts_date <= 1677513600 AND status = 1 AND order_status =2 and p_type = 1 AND user_org_id = 10215").Find(&order).Order("patient_id").Error
 	return
 }
 
-type HisDoctorAdviceInfoTen 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"`
-	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Status                int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+type VmHisOrderInfo9504Two struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	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"`
+	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	SettleType       int64   `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+}
 
-	Price                float64 `gorm:"column:price" json:"price" form:"price"`
-	DrugId               int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Drug                 Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
-	IsMedicine           int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
-	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+func (VmHisOrderInfo9504Two) TableName() string {
+	return "his_order_info"
+}
+
+type HisDoctorAdviceInfoTen 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"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate            int64                 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	AdviceName            string                `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string                `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	SingleDose            float64               `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string                `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64               `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string                `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string                `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64                 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	RecordDate            int64                 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugSpec              float64               `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string                `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescriptionId        int64                 `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	VmHisOrderInfo9504Two VmHisOrderInfo9504Two `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
+	Price                 float64               `gorm:"column:price" json:"price" form:"price"`
+	DrugId                int64                 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug                  Drug                  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	IsMedicine            int64                 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64                 `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdviceInfoTen) TableName() string {
@@ -635,38 +698,39 @@ func (HisDoctorAdviceInfoTen) TableName() string {
 }
 
 type HisPrescriptionProjectTen struct {
-	ID                 int64        `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64      `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64        `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              string       `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string       `gorm:"column:day" json:"day" form:"day"`
-	VMHisProject       VMHisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	VMGoodInfo         VMGoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
-	Remark             string       `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string       `gorm:"column:unit" json:"unit" form:"unit"`
-	Type               int64        `gorm:"column:type" json:"type" form:"type"`
-	Doctor             int64        `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime      int64        `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff     int64        `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState     int64        `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime          int64        `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState         int64        `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker            int64        `gorm:"column:checker" json:"checker" form:"checker"`
-	StartTime          int64        `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	TeamId             int64        `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	ProjectId             int64                 `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                 float64               `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	Ctime                 int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64                 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate            int64                 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId        int64                 `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                 string                `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn             string                `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg           string                `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose            string                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay           string                `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string                `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                   string                `gorm:"column:day" json:"day" form:"day"`
+	VMHisProject          VMHisProject          `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	VMGoodInfo            VMGoodInfo            `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Remark                string                `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                  string                `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                  int64                 `gorm:"column:type" json:"type" form:"type"`
+	Doctor                int64                 `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime         int64                 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64                 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64                 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime             int64                 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                 `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker               int64                 `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime             int64                 `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId                int64                 `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	VmHisOrderInfo9504Two VmHisOrderInfo9504Two `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
 
 	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
@@ -677,14 +741,19 @@ type HisPrescriptionProjectTen struct {
 func (HisPrescriptionProjectTen) TableName() string {
 	return "his_prescription_project"
 }
-
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
-	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2022-12-01 00:00:00' AND in_hosptial_time <= '2022-12-31 23:59:59'", orgid).Find(&paitent).Error
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2023-02-01 00:00:00' AND in_hosptial_time <= '2023-02-28 23:59:59'", orgid).Find(&paitent).Error
+	return paitent, err
+}
+func GetHisPatient2222(orgid int64) (paitent []*models.HisPatient, err error) {
+	err = XTReadDB().Model(&models.HisPatient{}).Where("user_org_id = ?  and status = 1 AND record_date >= 1654012800 AND record_date <= 1659196800 ", orgid).Find(&paitent).Error
 	return paitent, err
 }
-
 func SaveHP(paitent *models.HisHospitalCheckRecord) {
 	writeDb.Save(&paitent)
+}
+func SaveHPtWO(paitent *models.HisPatient) {
+	writeDb.Save(&paitent)
 
 }
 
@@ -760,6 +829,8 @@ type HisOrder9504 struct {
 	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
 	SettleStartTime       int64     `gorm:"settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	OthDesc               string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays               string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 
 	Creator            int64                 `gorm:"column:creator" json:"creator" form:"creator"`
 	PType              int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
@@ -855,7 +926,6 @@ type VmHisOrderInfo95042 struct {
 func (VmHisOrderInfo95042) TableName() string {
 	return "his_order_info"
 }
-
 func GetHisOrderDetail9504() (order []*HisOrder9504, err error) {
 	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
@@ -866,7 +936,6 @@ func GetHisOrderDetail9504() (order []*HisOrder9504, err error) {
 	}).Where("settle_accounts_date >= 1640966400 AND settle_accounts_date <= 1661875200 AND status = 1 AND order_status =2  AND user_org_id = 9504").Find(&order).Order("setl_time").Error
 	return
 }
-
 func GetHisOrderDetail10188() (order []*HisOrder9504, err error) {
 	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
@@ -890,7 +959,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("settle_accounts_date >= 1664553600 AND settle_accounts_date <= 1672416000 AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
+	}).Where("settle_accounts_date >= 1672502400 AND settle_accounts_date <= 1676822400 AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
 	return
 }
 
@@ -1035,9 +1104,181 @@ func SaveSch(sch models.Schedule) (err error) {
 }
 
 func SaveSchTwo(sch models.Schedule, sch_two models.Schedule) (err error) {
-	//err = writeDb.Save(&sch).Error
-	err = writeDb.Model(&Schedule{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error
-	err = writeDb.Model(&Schedule{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error
+	utx := writeDb.Begin()
+	if err = utx.Model(&Schedule{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	if err = utx.Model(&Schedule{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error; err != nil {
+		utx.Rollback()
+		return err
+	}
+	utx.Commit()
+	return err
+}
+
+func GetHisOrderInfoDetail() (order []*VmHisOrderInfo9504, err error) {
+	err = readDb.Model(&VmHisOrderInfo9504{}).Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
+	}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("Drug")
+	}).Where("status = 1 AND order_number = '202302201702258124538'").Find(&order).Error
+	return
+}
+
+func GetHisPrescriptionInfoDetail() (order []*HisPrescriptionProjectTen, err error) {
+	err = readDb.Model(&HisPrescriptionProjectTen{}).Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
+	}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("Drug")
+	}).Where("status = 1 AND order_number = '202302201702258124538'").Find(&order).Error
+	return
+}
+
+type HisOrder10138 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"`
+	Status             int64                 `gorm:"column:status" json:"status" form:"status"`
+	Number             string                `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrderStatus        int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	Ctime              int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	SettleAccountsDate int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	VmHisOrderInfo9504 []*VmHisOrderInfo9504 `json:"infos" form:"infos"`
+}
+
+func (HisOrder10138) TableName() string {
+	return "his_order"
+}
+
+type PatientVM10138 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"`
+	Name          string           `gorm:"column:name" json:"name" form:"name"`
+	HisOrder10138 []*HisOrder10138 `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"order"`
+}
+
+func (PatientVM10138) TableName() string {
+	return "xt_patients"
+}
+
+func GetHisAllPatientOrder(start_time int64, end_time int64) (order []*PatientVM10138, err error) {
+	err = readDb.Model(&PatientVM10138{}).Preload("HisOrder10138", " ctime >= ? AND ctime <= ? AND status = 1 AND order_status = 2", start_time, end_time).Where("user_org_id = 10138 AND status = 1").Find(&order).Error
+	return
+}
 
+func GetHisOrderInfoDetail10138(order_number string) (order []*VmHisOrderInfo9504, err error) {
+	err = readDb.Model(&VmHisOrderInfo9504{}).Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
+	}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("Drug")
+	}).Where("status = 1 AND order_number = ?", order_number).Find(&order).Error
+	return
+}
+
+//func GetHisOrderDetailOne(start_time int64, end_time int64) (order []*HisOrder9504, err error) {
+//	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
+//		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
+//			return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
+//		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
+//			return db.Where("status = 1").Preload("Drug")
+//		})
+//	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2  AND user_org_id = 9919", start_time, end_time).Find(&order).Order("setl_time").Error
+//	return
+//}
+//
+
+type HisOrderTenOne 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"`
+	Ctime                 int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64                 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	Number                string                `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode               int64                 `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg               string                `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                string                `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                string                `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime           string                `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid           string                `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus           int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId               string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                string                `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                 string                `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName               string                `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType           string                `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                string                `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                  string                `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                  string                `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                  time.Time             `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                   float64               `gorm:"column:age" json:"age" form:"age"`
+	Insutype              string                `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType               string                `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag           string                `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime              string                `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType         string                `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType               string                `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt          float64               `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt       float64               `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay        float64               `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt         float64               `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt           float64               `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc            float64               `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay               float64               `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay            float64               `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay       float64               `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay              float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay              float64               `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay              float64               `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                float64               `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt         float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt            float64               `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	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"`
+	HospPartAmt           float64               `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                  float64               `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay         float64               `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId          string                `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins             string                `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                string                `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType               string                `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail            string                `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance   int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                int64                 `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64               `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string                `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64               `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64               `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64               `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64               `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64               `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64               `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string                `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string                `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64                 `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	HisPrescriptionTen    []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
+	OthDesc               string                `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays               string                `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+}
+
+func (HisOrderTenOne) TableName() string {
+	return "his_order"
+}
+
+func GetHisOrderDetailOne(start_time int64, end_time int64) (order []*HisOrderTen, err error) {
+	err = readDb.Model(&HisOrderTen{}).Preload("HisPrescriptionTen", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("HisPrescriptionInfoOne", "status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Preload("VmHisOrderInfo9504Two", "status = 1").Preload("VMHisProject", "status = 1").Preload("VMGoodInfo", "status = 1")
+		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Preload("VmHisOrderInfo9504Two", "status = 1").Preload("Drug", "status = 1")
+		})
+	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2 AND user_org_id = 9919 AND setl_id <> ''", start_time, end_time).Find(&order).Error
 	return
 }

service/drug_pharmacy_management_service.go

@@ -1647,3 +1647,10 @@ func GetPharmacyConfig(orgid int64) (models.PharmacyConfig, error) {
 
 	return config, err
 }
+
+func CreateDrugError(drugError models.XtDrugError) error {
+
+	err := XTWriteDB().Create(&drugError).Error
+
+	return err
+}

service/his_charge_service.go

@@ -240,7 +240,7 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 	return
 }
 
-func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisLabelPrintInfo{})
 	if is_print > 0 {
@@ -251,7 +251,31 @@ func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time i
 		db = db.Where("patient_name Like ?", keywors)
 
 	}
-	err = db.Where("user_org_id = ? AND record_date = ? AND status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	if tube_color > 0 {
+		db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?", tube_color)
+		//db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?",tube_color)
+	}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	return
+}
+func GetLabelPrintListTwo(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisLabelPrintInfo{})
+	if is_print > 0 {
+		db = db.Where("is_print = ?", is_print)
+	}
+	if len(keywors) > 0 {
+		keywors = "%" + keywors + "%"
+		db = db.Where("patient_name Like ?", keywors)
+
+	}
+	if tube_color > 0 {
+		//db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?",tube_color)
+		db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?", tube_color)
+	}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
 	return
 }
 

service/his_config_service.go

@@ -40,6 +40,10 @@ func SaveHisPrescriptionTemplate(template *models.HisPrescriptionTemplate) (err
 	return
 
 }
+func GetHisPrescriptionInfoTemplates(p_id int64, user_org_id int64) (p []*models.HisPrescriptionInfoTemplate, err error) {
+	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND p_template_id = ?", user_org_id, p_id).Find(&p).Error
+	return
+}
 
 func DelelteHisPrescriptionInfoTemplate(id int64, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error

service/his_service.go

@@ -968,7 +968,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -982,6 +982,13 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 
 	}
 
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.schedule_type = ? AND sch.schedule_date >= ? AND sch.schedule_date <= ?", sch_type, start_time_timestamp, end_time_timestamp)
+	}
+	if zone_type > 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.partition_id = ?", zone_type)
+	}
+
 	if sort_type == 1 {
 		if start_time_timestamp != 0 {
 			db = db.Where("his_order.settle_accounts_date>=?", start_time_timestamp)
@@ -990,7 +997,6 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 			db = db.Where("his_order.settle_accounts_date<=?", end_time_timestamp)
 		}
 	} else {
-
 		if len(start_time) != 0 {
 			db = db.Where("his_order.setl_time>=?", start_time+" 00:00:00")
 		}
@@ -1534,7 +1540,10 @@ func GetMobileCallHisPrescriptions(start_time int64, end_time int64, org_id int6
 
 	return
 }
-
+func GetHisPatientByNumber(number string) (his models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("number = ? AND status = 1", number).First(&his).Error
+	return
+}
 func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
 	return
@@ -1607,6 +1616,12 @@ func GetPatientByIDTwo(orgID int64, patientID int64) (Patients, error) {
 	return patient, err
 }
 
+func GetPatientByIDTenTwo(orgID int64, patientID int64) (models.PatientTwos, error) {
+	var patient models.PatientTwos
+	err := readDb.Model(&models.PatientTwos{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
+	return patient, err
+}
+
 func GetHisPrescriptionByPatientID(patientID int64, orgID int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND patient_id = ? AND status = 1", orgID, patientID).Preload("XtHisDepartment", "status = 1").Last(&info).Error
 	return
@@ -2726,3 +2741,8 @@ func UpdatePatientDialysisOrder(patient_id int64, url string) error {
 	err := XTWriteDB().Model(&models.XtPatients{}).Where("id =? and status=1", patient_id).Updates(map[string]interface{}{"url": url}).Error
 	return err
 }
+
+func GetHisOrderByIDTenOne(order_id string) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
+	return
+}

service/patient_schedule_template_service.go

@@ -444,22 +444,22 @@ func UpdateScheduleTemplate(orgID int64, template_id int64,
 	//	}
 	//}
 
-	if orgID != 9671 && orgID != 10340 {
-		if shouldUpdateNextWeekSchedules {
-			nextWeek := now.AddDate(0, 0, 7)
-			if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
-				tx.Rollback()
-				return updateErr
-			}
-		}
-		if shouldUpdateNextSecondWeekSchedules {
-			nextWeek := now.AddDate(0, 0, 14)
-			if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
-				tx.Rollback()
-				return updateErr
-			}
-		}
-	}
+	//if orgID != 9671 && orgID != 10340 {
+	//	if shouldUpdateNextWeekSchedules {
+	//		nextWeek := now.AddDate(0, 0, 7)
+	//		if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//			tx.Rollback()
+	//			return updateErr
+	//		}
+	//	}
+	//	if shouldUpdateNextSecondWeekSchedules {
+	//		nextWeek := now.AddDate(0, 0, 14)
+	//		if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//			tx.Rollback()
+	//			return updateErr
+	//		}
+	//	}
+	//}
 
 	tx.Commit()
 	return nil
@@ -909,7 +909,7 @@ func GetSchTemplatePatientList(orgID int64) ([]*SchTemplatePatient, error) {
 }
 
 func UpdateTemplateItemWeek(orgID int64, id int64, week_time int8) {
-	readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"week": week_time})
+	writeDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"week": week_time})
 	return
 }
 

service/pharmacy_service.go

@@ -2021,3 +2021,14 @@ func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime i
 
 	return advice, err
 }
+
+func GetFlow(drug_id int64, system_time int64, org_id int64, patient_id int64) (flow []*models.DrugFlow, err error) {
+
+	err = XTWriteDB().Where("drug_id = ? and system_time =? and user_org_id = ? and status = 1 and patient_id =?", drug_id, system_time, org_id, patient_id).Find(&flow).Error
+	return flow, err
+}
+
+func UpdateAdviceFlow(id int64) error {
+	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and status = 1 and is_medicine =0", id).Update(map[string]interface{}{"is_medicine": 1}).Error
+	return err
+}