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

controllers/sz/sz_his_api_controller.go

@@ -2278,7 +2278,8 @@ func (c *SZHisApiController) GetSettleInfo() {
 							DoctorCode:         doctor_code,
 							Total:              detItemFeeSumamt,
 							DoseCode:           dose_code,
-							Spec:               subItem.BaseDrugLib.DrugSpec,
+							Spec:               strconv.Itoa(int(subItem.BaseDrugLib.MinNumber)) + "*" + subItem.BaseDrugLib.MinUnit + ":" + strconv.FormatFloat(subItem.BaseDrugLib.Dose, 'E', -1, 64) + subItem.BaseDrugLib.DoseUnit,
+							Unit:               subItem.PrescribingNumberUnit,
 						}
 						customs = append(customs, cus)
 					}
@@ -2312,6 +2313,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 								Total:              detItemFeeSumamt,
 								DoseCode:           "",
 								Spec:               "次",
+								Unit:               "次",
 							}
 							customs = append(customs, cus)
 
@@ -2339,7 +2341,8 @@ func (c *SZHisApiController) GetSettleInfo() {
 								DoctorCode:         doctor_code,
 								Total:              detItemFeeSumamt,
 								DoseCode:           "",
-								Spec:               "次",
+								Spec:               "支",
+								Unit:               "支",
 							}
 							customs = append(customs, cus)
 
@@ -3094,7 +3097,8 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 						DoctorCode:         doctor_code,
 						Total:              detItemFeeSumamt,
 						DoseCode:           dose_code,
-						Spec:               subItem.BaseDrugLib.DrugSpec,
+						Spec:               strconv.Itoa(int(subItem.BaseDrugLib.MinNumber)) + "*" + subItem.BaseDrugLib.MinUnit + ":" + strconv.FormatFloat(subItem.BaseDrugLib.Dose, 'E', -1, 64) + subItem.BaseDrugLib.DoseUnit,
+						Unit:               subItem.PrescribingNumberUnit,
 					}
 					customs = append(customs, cus)
 				}
@@ -3128,6 +3132,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 							Total:              detItemFeeSumamt,
 							DoseCode:           "",
 							Spec:               "次",
+							Unit:               "次",
 						}
 						customs = append(customs, cus)
 
@@ -3156,7 +3161,8 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 							DoctorCode:         doctor_code,
 							Total:              detItemFeeSumamt,
 							DoseCode:           "",
-							Spec:               "次",
+							Spec:               "支",
+							Unit:               "支",
 						}
 						customs = append(customs, cus)
 
@@ -4340,6 +4346,15 @@ func (c *SZHisApiController) GetSettleAccounts() {
 	//verifyCode := "000000|2c9854287e7c3cbc34439ab8e5157816"
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
+		//temp_mz_number := miConfig.Code + year + month + day +
+		//	fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
+		//tempVerifyCode, tempVersionCode := ReadCardGetCode("XX001" + "|" + temp_mz_number + "|" + miConfig.Code)
+
+		//yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+
+		//yiliao_number = "%GALMAFXJGKUKZNKWAIUH?;07857319025346309758?"
+
+		//result001 := service.SzybXX001(opera_name, opera_code, miConfig.Code, yiliao_number, tempVerifyCode, temp_mz_number, tempVersionCode)
 
 		result := service.SzybJY001(doctor_name, doctor_code, miConfig.Code, order.OrgSetlNumber, order.MzNumber, verifyCode, version_code)
 		fmt.Println(result)
@@ -4385,6 +4400,8 @@ func (c *SZHisApiController) GetSettleAccounts() {
 				"yiliao_leibie":      yiliao_leibie,
 				"before_money":       res2.Transbody.Aae240,
 				"after_money":        order.AccountPrice,
+				"dialysis_no":        patient.DialysisNo,
+				"patient_info":       his.PatientInfo,
 			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{

models/drug.go

@@ -59,6 +59,12 @@ type BaseDrugLib struct {
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+
+	MinNumber int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose      float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit  string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDay   string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice  float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/sz_his_models.go

@@ -17,6 +17,7 @@ type CustomDetail struct {
 	DoseCode           string
 	Spec               string
 	CustomNumber       string
+	Unit               string
 }
 
 type DrugDetail struct {

service/sz_his_service.go

@@ -211,7 +211,7 @@ func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas [
 		feedetailInfo["akc225"] = item.Price
 		feedetailInfo["akc226"] = item.Count
 		feedetailInfo["akc264"] = item.Total
-		feedetailInfo["aka067"] = "元"
+		feedetailInfo["aka067"] = item.Unit
 		feedetailInfo["akc271"] = item.ChargeOrderDate
 		feedetailInfo["bkc320"] = drug_doctor_code