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

controllers/gobal_config_api_controller.go

@@ -67,6 +67,12 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
 	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
 
+	beego.Router("/api/hisstockpriceconfig/get", &GobalConfigApiController{}, "get:GetHisStockPriceConfig")
+	beego.Router("/api/hisstockpriceconfig/isopen", &GobalConfigApiController{}, "post:PostHisStockPriceConfig")
+
+	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
+	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
+
 	beego.Router("/api/xtconfigproject/isopen", &GobalConfigApiController{}, "post:PostXTHisProjectConfig")
 
 	beego.Router("/api/isopen/init", &GobalConfigApiController{}, "get:GetAllIsOpenConfig")
@@ -1405,6 +1411,60 @@ func (c *GobalConfigApiController) PostXTHisConfig() {
 	return
 }
 
+func (c *GobalConfigApiController) PostHisStockPriceConfig() {
+	is_open, _ := c.GetBool("is_open", false)
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id := adminUserInfo.CurrentOrgId
+	isOpen := 0
+
+	if is_open {
+		isOpen = 1
+	} else {
+		isOpen = 2
+	}
+
+	config := models.HisStockPriceConfig{
+		UserOrgId: org_id,
+		IsOpen:    int64(isOpen),
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	errs, configs := service.FindHisStockPriceRecordByOrgId(org_id)
+
+	if errs == gorm.ErrRecordNotFound {
+		err := service.CreateHisStockPriceRecord(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	} else if errs == nil {
+		modifyConfig := models.HisStockPriceConfig{
+			ID:        configs.ID,
+			UserOrgId: org_id,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			IsOpen:    int64(isOpen),
+		}
+
+		err := service.UpdateHisStockPriceRecord(&modifyConfig)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"is_open": is_open,
+	})
+
+	return
+}
+
 func (c *GobalConfigApiController) PostXTHisProjectConfig() {
 	is_open, _ := c.GetBool("is_open", false)
 	adminUserInfo := c.GetAdminUserInfo()
@@ -1470,6 +1530,15 @@ func (c *GobalConfigApiController) GetXTHisConfig() {
 	})
 }
 
+func (c *GobalConfigApiController) GetHisStockPriceConfig() {
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindHisStockPriceRecordByOrgId(adminUserInfo.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
 func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)

controllers/his_api_controller.go

@@ -559,12 +559,29 @@ func (c *HisApiController) GetHisPatientInfo() {
 	return
 
 }
+
 func (c *HisApiController) GetHisPrescriptionConfig() {
 	adminInfo := c.GetAdminUserInfo()
 	//获取医嘱模版
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 	//获取所有基础药
 	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+
+	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
+	if config.ID > 0 && config.IsOpen == 1 {
+		for _, item := range drugs {
+			var index = 0
+			for _, subItem := range item.OtherDrugWarehouseInfo {
+				if index == 0 {
+					if subItem.StockMaxNumber*item.MinNumber+subItem.StockMinNumber > 0 {
+						index = index + 1
+						item.MinPrice = subItem.Price
+					}
+				}
+			}
+		}
+	}
+
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
@@ -943,6 +960,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.PatientId = patient_id
 							s.HisPatientId = his_patient_id
 							s.StartTime = pTime
+
 							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -1045,7 +1063,8 @@ func (c *HisApiController) CreateHisPrescription() {
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.CurrentOrgId, patient_id, recordDateTime, p.ProjectId)
 								if consumables.ID > 0 {
-									consumables.Count = int64(p.Count)
+									cnt, _ := strconv.ParseInt(p.Count, 10, 64)
+									consumables.Count = cnt
 									service.UpdateConsumables(&consumables)
 								}
 							}
@@ -1359,10 +1378,12 @@ func (c *HisApiController) DeletePrescription() {
 	if err == nil {
 		if len(projects) > 0 {
 			for _, item := range projects {
+				service.DeletePrintInfo(item.ID) //删除打印信息
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(item.Count), 10), 64)
+						//cnt, _ := strconv.ParseInt(item.Count, 10, 64)
+						f_count, _ := strconv.ParseFloat(item.Count, 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
 					}
@@ -1447,6 +1468,7 @@ func (c *HisApiController) DeleteProject() {
 	}
 	err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
+		service.DeletePrintInfo(id)
 		label, _ := service.GetProjectById(adminInfo.CurrentOrgId, id, project.RecordDate, project.PatientId)
 		label.Status = 0
 		service.CreateHisLabelRecord(&label)
@@ -1454,7 +1476,8 @@ func (c *HisApiController) DeleteProject() {
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -1952,8 +1975,7 @@ func (c *HisApiController) setProjectWithJSONTwo(project *models.HisPrescription
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -2099,6 +2121,41 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 	//	advice.WeekDay = week_day
 	//}
 
+	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+		drugSpecUnit, _ := json["min_unit"].(string)
+		advice.DrugSpecUnit = drugSpecUnit
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
+		advice.SingleDose = singleDose
+	}
+	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["single_dose_unit"].(string)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
+
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		deliveryWay, _ := json["delivery_way"].(string)
+		advice.DeliveryWay = deliveryWay
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		executionFrequency, _ := json["execution_frequency"].(string)
+		advice.ExecutionFrequency = executionFrequency
+	}
+
+	if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
+		advice.Price = price
+	}
+	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
+		med_list_codg, _ := json["medical_insurance_number"].(string)
+		advice.MedListCodg = med_list_codg
+	}
+	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
+		day := int64(json["day"].(float64))
+		advice.Day = day
+	}
+
 	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
 		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
 		advice.PrescribingNumberUnit = prescribingNumberUnit
@@ -2111,6 +2168,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 			hisAdvice, err := service.GetHisDoctorAdvicesById(advice.ID)
 			if err == nil {
 				if hisAdvice.ID > 0 {
+
 					advice.ExecutionTime = hisAdvice.ExecutionTime
 					advice.ExecutionStaff = hisAdvice.ExecutionStaff
 					advice.ExecutionState = hisAdvice.ExecutionState
@@ -2119,6 +2177,16 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.CheckState = hisAdvice.CheckState
 					advice.StartTime = hisAdvice.StartTime
 					advice.HospApprFlag = hisAdvice.HospApprFlag
+
+					if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark {
+						advice.ExecutionTime = 0
+						advice.ExecutionStaff = 0
+						advice.ExecutionState = 2
+						advice.CheckTime = 0
+						advice.Checker = 0
+						advice.CheckState = 2
+					}
+
 					//advice.Groupno = hisAdvice.Groupno
 
 				}
@@ -2246,40 +2314,6 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 	//	advice.StartTime = start_time
 	//}
 
-	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
-		drugSpecUnit, _ := json["min_unit"].(string)
-		advice.DrugSpecUnit = drugSpecUnit
-	}
-	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
-		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
-		advice.SingleDose = singleDose
-	}
-	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
-		singleDoseUnit, _ := json["single_dose_unit"].(string)
-		advice.SingleDoseUnit = singleDoseUnit
-	}
-
-	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
-		deliveryWay, _ := json["delivery_way"].(string)
-		advice.DeliveryWay = deliveryWay
-	}
-	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
-		executionFrequency, _ := json["execution_frequency"].(string)
-		advice.ExecutionFrequency = executionFrequency
-	}
-
-	if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
-		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
-		advice.Price = price
-	}
-	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
-		med_list_codg, _ := json["medical_insurance_number"].(string)
-		advice.MedListCodg = med_list_codg
-	}
-	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
-		day := int64(json["day"].(float64))
-		advice.Day = day
-	}
 	return 0
 }
 
@@ -2326,8 +2360,8 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -2383,7 +2417,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total - f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -2396,12 +2430,18 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				if project.Count < temp_project.Count {
-					other_count := temp_project.Count - project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_two - f_count_one
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total + other_count_two
 					service.UpdateGoodInfo(&good)
 				} else if project.Count > temp_project.Count {
-					other_count := project.Count - temp_project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_one - f_count_two
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total - other_count_two
 					service.UpdateGoodInfo(&good)
@@ -2557,8 +2597,8 @@ func (c *HisApiController) setProjectTemplateWithJSON(project *models.HisPrescri
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -3260,7 +3300,8 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
-					total = total + (subItem.Price * float64(subItem.Count))
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					total = total + (subItem.Price * cnt)
 				}
 			}
 
@@ -3330,11 +3371,12 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 					cus := &Custom{
 						AdviceId:         0,
 						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+						Cut:              fmt.Sprintf("%.4f", cnt),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,
@@ -5097,7 +5139,8 @@ func (c *HisApiController) PreSettle() {
 		}
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-				total = total + (subItem.Price * float64(subItem.Count))
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+				total = total + (subItem.Price * cnt)
 			}
 		}
 
@@ -5155,12 +5198,12 @@ func (c *HisApiController) PreSettle() {
 
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 				cus := &Custom{
 					AdviceId:         0,
 					ProjectId:        subItem.ID,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cnt),
+					Cut:              fmt.Sprintf("%.2f", cnt),
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.MedListCodg,

controllers/his_config_api_controller.go

@@ -413,8 +413,8 @@ func (c *HisConfigApiController) setProjectTemplateWithJSON(project *models.HisP
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {

controllers/his_hospital_api_controller.go

@@ -468,7 +468,8 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 		}
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-				total = total + (subItem.Price * float64(subItem.Count))
+				cut, _ := strconv.ParseFloat(subItem.Count, 64)
+				total = total + (subItem.Price * cut)
 			}
 		}
 
@@ -532,12 +533,15 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 			}
 		}
 		if item.Type == 2 { //项目
+
 			for _, subItem := range item.HisPrescriptionProject {
+				cut, _ := strconv.ParseFloat(subItem.Count, 64)
+
 				cus := &Custom{
 					AdviceId:         0,
 					ProjectId:        subItem.ID,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cut),
+					Cut:              fmt.Sprintf("%.2f", cut),
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.MedListCodg,

controllers/his_project_api_controller.go

@@ -809,12 +809,19 @@ func (this *HisProjectApiController) DeleteProject() {
 }
 
 func (this *HisProjectApiController) GetHisProject() {
-
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	project, err := service.GetHisProject(orgId)
 	good_info, err := service.GetGoodInfoMation(orgId)
-
+	_, config := service.FindHisStockPriceRecordByOrgId(orgId)
+	if config.ID > 0 && config.IsOpen == 1 {
+		//处理耗材不同批号价格问题
+		for _, item := range good_info {
+			if len(item.GoodSotckInfo) > 0 {
+				item.PackingPrice = item.GoodSotckInfo[0].Price
+			}
+		}
+	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2682,6 +2682,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 		for _, item := range projects {
+			cnt, _ := strconv.ParseFloat(item.Count, 64)
 			var advice models.HisDoctorAdviceInfo
 			advice.ID = item.ID
 			advice.Checker = item.Checker
@@ -2689,7 +2690,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			advice.CheckState = item.CheckState
 			advice.ExecutionState = item.ExecutionState
 			advice.ExecutionStaff = item.ExecutionStaff
-			advice.PrescribingNumber = float64(item.Count)
+			advice.PrescribingNumber = cnt
 			advice.PrescribingNumberUnit = item.Unit
 			advice.AdviceDoctor = item.Doctor
 			if item.Type == 3 {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -270,12 +270,14 @@ func (c *MobileHisApiController) DeletePrescription() {
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
-	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
 
 	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
 		if len(projects) > 0 {
 			for _, item := range projects {
+				service.DeletePrintInfo(item.ID)
+
 				if item.Type == 3 { //处理透前准备耗材数量数据
 					consumables, _ := service.FindHisConsumablesByID(item.UserOrgId, item.PatientId, item.RecordDate, item.ProjectId)
 					if consumables.ID > 0 {
@@ -287,7 +289,7 @@ func (c *MobileHisApiController) DeletePrescription() {
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(item.Count), 10), 64)
+						f_count, _ := strconv.ParseFloat(item.Count, 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
 					}
@@ -361,10 +363,11 @@ func (c *MobileHisApiController) DeleteProject() {
 
 	err := service.DelelteProject(id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
+		service.DeletePrintInfo(id)
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -762,7 +765,8 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.Org.Id, patient_id, recordDateTime, p.ProjectId)
 								if consumables.ID > 0 {
-									consumables.Count = int64(p.Count)
+									cnt, _ := strconv.ParseInt(p.Count, 10, 64)
+									consumables.Count = cnt
 									service.UpdateConsumables(&consumables)
 								}
 							}
@@ -1086,8 +1090,8 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -1127,7 +1131,7 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total - f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -1140,12 +1144,18 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				if project.Count < temp_project.Count {
-					other_count := temp_project.Count - project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_two - f_count_one
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total + other_count_two
 					service.UpdateGoodInfo(&good)
 				} else if project.Count > temp_project.Count {
-					other_count := project.Count - temp_project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_one - f_count_two
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total - other_count_two
 					service.UpdateGoodInfo(&good)

controllers/public_api_controller.go

@@ -69,7 +69,7 @@ func PublicApiRegistRouters() {
 
 	beego.Router("/handle10215", &PublicApiController{}, "get:Handle10215")
 
-	//beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
+	beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
 
 }
 
@@ -1700,35 +1700,27 @@ func (c *PublicApiController) HandleHIS() {
 
 }
 
-//func (c *PublicApiController)HandleOrder(){
-//	//orders, _ := service.GetAllHisOrder()
-//
-//
-//	order, _ := service.GetLastHisOrder()
-//
-//	fpNumber, _ := strconv.Atoi(order.FaPiaoNumber)
-//
-//
-//	//fmt.Println(fpNumber)
-//
-//	//for index, item := range orders {
-//	//	item.FaPiaoCode ="144072080589"
-//	//	var zero string
-//	//	if 1520 + int64(index) >= 1000{
-//	//		zero = "0000" + strconv.FormatInt(1520 + int64(index),10)
-//	//	}else if 1520 + int64(index) >= 10000{
-//	//		zero = "000" + strconv.FormatInt(1520 + int64(index),10)
-//	//	} else if 1520 + int64(index) >= 100000{
-//	//		zero = "00" +strconv.FormatInt(1520 + int64(index),10)
-//	//	} else if 1520 + int64(index) >= 1000000{
-//	//		zero = "0" +strconv.FormatInt(1520 + int64(index),10)
-//	//	}else {
-//	//		zero = strconv.FormatInt(1520 + int64(index),10)
-//	//	}
-//	//	item.FaPiaoNumber = zero
-//	//	service.SaveOrder(item)
-//	//}
-//}
+func (c *PublicApiController) HandleOrder() {
+	orders, _ := service.GetAllHisOrder()
+
+	for index, item := range orders {
+		item.FaPiaoCode = "144072080589"
+		var zero string
+		if 1520+int64(index) >= 1000 {
+			zero = "0000" + strconv.FormatInt(1520+int64(index), 10)
+		} else if 1520+int64(index) >= 10000 {
+			zero = "000" + strconv.FormatInt(1520+int64(index), 10)
+		} else if 1520+int64(index) >= 100000 {
+			zero = "00" + strconv.FormatInt(1520+int64(index), 10)
+		} else if 1520+int64(index) >= 1000000 {
+			zero = "0" + strconv.FormatInt(1520+int64(index), 10)
+		} else {
+			zero = strconv.FormatInt(1520+int64(index), 10)
+		}
+		item.FaPiaoNumber = zero
+		service.SaveOrder(item)
+	}
+}
 
 func Mkdir(dir string) {
 	// 创建文件夹
@@ -1896,7 +1888,7 @@ func (c *PublicApiController) Handle10215() {
 							Mtime:              time.Now().Unix(),
 							PatientId:          ssubItem.PatientId,
 							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
+							Count:              "1",
 							FeedetlSn:          "",
 							MedListCodg:        "",
 							SingleDose:         "1",

models/his_charge_models.go

@@ -1,14 +1,14 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID         int64 `gorm:"column:id" json:"id" form:"id"`
-	ProjectId  int64 `gorm:"column:project_id" json:"project_id" form:"project_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"`
-	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count      int64 `gorm:"column:count" json:"count" form:"count"`
-	Type       int64 `gorm:"column:type" json:"type" form:"type"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_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"`
+	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count      string `gorm:"column:count" json:"count" form:"count"`
+	Type       int64  `gorm:"column:type" json:"type" form:"type"`
 
 	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`

models/his_models.go

@@ -749,7 +749,7 @@ type HisPrescriptionProject struct {
 	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              int64      `gorm:"column:count" json:"count" form:"count"`
+	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"`
@@ -1429,7 +1429,7 @@ type HisPrescriptionProjectTemplate struct {
 	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"`
-	Count              int64        `gorm:"column:count" json:"count" form:"count"`
+	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"`
@@ -1618,3 +1618,16 @@ type VMHisOrderTwo struct {
 func (VMHisOrderTwo) TableName() string {
 	return "his_order"
 }
+
+type HisStockPriceConfig 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"`
+	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"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (HisStockPriceConfig) TableName() string {
+	return "his_stock_price_config"
+}

models/stock_models.go

@@ -1116,10 +1116,11 @@ type SgjCancelStockInfo struct {
 }
 
 type GoodSotckInfo struct {
-	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	StockCount        int64  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	GoodName          string `gorm:"column:good_name" json:"good_name"`
-	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	Price             float64 `gorm:"column:price" json:"price" form:"price"`
 }
 
 func (GoodSotckInfo) TableName() string {

service/dialysis_service.go

@@ -1179,7 +1179,7 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 
 func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count >0 and status = 1").Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1").Find(&goodinfo).Error
 	return goodinfo, err
 }
 

service/gdyb_service.go

@@ -384,10 +384,10 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 				//var randNum int
 				//randNum = rand.Intn(10000) + 1000
 				if len(subItem.MedListCodg) > 0 {
-
+					cut, _ := strconv.ParseFloat(subItem.Count, 64)
 					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cut),
+						Cut:              fmt.Sprintf("%.2f", cut),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,

service/gobal_config_service.go

@@ -185,6 +185,11 @@ func FindXTHisRecordByOrgId(org_id int64) (err error, config models.XtHisConfig)
 	return
 }
 
+func FindHisStockPriceRecordByOrgId(org_id int64) (err error, config models.HisStockPriceConfig) {
+	err = readDb.Model(&models.HisStockPriceConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return
+}
+
 func UpdateXTHisRecord(config *models.XtHisConfig) (err error) {
 	err = writeDb.Save(config).Error
 	return
@@ -195,6 +200,16 @@ func CreateXTHisRecord(config *models.XtHisConfig) (err error) {
 	return
 }
 
+func CreateHisStockPriceRecord(config *models.HisStockPriceConfig) (err error) {
+	err = writeDb.Model(&models.HisStockPriceConfig{}).Create(config).Error
+	return
+}
+
+func UpdateHisStockPriceRecord(config *models.HisStockPriceConfig) (err error) {
+	err = writeDb.Save(config).Error
+	return
+}
+
 //TODO:项目开关
 func FindXTHisProjectByOrgId(org_id int64) (err error, config models.XtHisProjectConfig) {
 	err = readDb.Model(&models.XtHisProjectConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error

service/his_service.go

@@ -588,13 +588,14 @@ func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_dat
 }
 
 type OtherDrugWarehouseInfo struct {
-	ID               int64 `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingCount int64 `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Status           int64 `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	StockMaxNumber   int64 `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber   int64 `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
 }
 
 func (OtherDrugWarehouseInfo) TableName() string {
@@ -1515,7 +1516,7 @@ type HisPrescriptionProject struct {
 	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              int64        `gorm:"column:count" json:"count" form:"count"`
+	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"`
@@ -2209,6 +2210,10 @@ func GetProjectById(user_org_id int64, p_project_id int64, record_time int64, pa
 	return
 }
 
+func DeletePrintInfo(id int64) {
+	writeDb.Model(&models.HisLabelPrintInfo{}).Where("p_project_id = ?", id).Updates(map[string]interface{}{"status": 0})
+}
+
 func CreateHisLabelRecord(label *models.HisLabelPrintInfo) error {
 	err := writeDb.Save(&label).Error
 	return err