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

controllers/sg/his_api_controller.go

@@ -3313,7 +3313,9 @@ 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)
 							}
 						}
 					}
@@ -4682,8 +4684,11 @@ func (c *HisApiController) GetPreUploadInfo() {
 						}
 					}
 					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)
 						}
 					}
 				}

controllers/zh/zh_his_api_controller.go

@@ -273,8 +273,90 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/outhopitaluncheck/get", &ZHHisApiController{}, "get:GetZHOutHospitalUnCheck")
 	beego.Router("/zh/api/refund", &ZHHisApiController{}, "get:ZHRefund")
 	beego.Router("/zh/api/refunddetail", &ZHHisApiController{}, "get:ZHRefundDetail")
+	beego.Router("/zh/api/patient/info", &ZHHisApiController{}, "get:ƒ")
 
 }
+func (c *ZHHisApiController) GetZHPatientInfo() {
+	id_card_no := c.GetString("id_card_no")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	patient, _ := service.GetPatientByIDCard(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+
+	if patient.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	role, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(c.GetAdminUserInfo().CurrentOrgId)
+	if config.IsOpen == 1 {
+
+		result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultTwo
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		var insutypes []string
+
+		var insutype string
+		var is390 int = 0
+		var is310 int = 0
+		for _, item := range res.Output.Iinfo {
+			if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+				insutypes = append(insutypes, item.Insutype)
+			}
+		}
+		if len(insutypes) == 1 {
+			insutype = insutypes[0]
+		} else {
+			for _, i := range insutypes {
+				if i == "390" {
+					is390 = 1
+				}
+
+				if i == "310" {
+					is310 = 1
+				}
+			}
+		}
+		if is390 == 1 {
+			insutype = "390"
+		}
+		if is310 == 1 {
+			insutype = "310"
+		}
+
+		if len(insutypes) == 0 {
+			insutype = "310"
+		}
+
+		if res.Infcode != 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": 0,
+				"info":        res,
+				"insutype":    insutype,
+			})
+		}
+
+	}
+}
 
 func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	id, _ := c.GetInt64("id")
@@ -293,6 +375,9 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	start_time := c.GetString("start_time")
 	balance_accounts_type, _ := c.GetInt64("balance_accounts_type")
 
+	social_type, _ := c.GetInt64("social_type")
+	psn_type, _ := c.GetInt64("psn_type")
+
 	//reg_type, _ := c.GetInt64("p_type")
 	med_type, _ := c.GetInt64("med_type")
 	diagnosis_ids_arr := strings.Split(diagnosis_ids, "-")
@@ -346,39 +431,39 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 
 	if res2.Infcode == 0 {
 
-		var insutypes []string
-
-		var insutype string
-		var is390 int = 0
-		var is310 int = 0
-		for _, item := range res2.Output.Iinfo {
-			if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-				insutypes = append(insutypes, item.Insutype)
-			}
-		}
-		if len(insutypes) == 1 {
-			insutype = insutypes[0]
-		} else {
-			for _, i := range insutypes {
-				if i == "390" {
-					is390 = 1
-				}
-
-				if i == "310" {
-					is310 = 1
-				}
-			}
-		}
-		if is390 == 1 {
-			insutype = "390"
-		}
-		if is310 == 1 {
-			insutype = "310"
-		}
-
-		if len(insutypes) == 0 {
-			insutype = "310"
-		}
+		//var insutypes []string
+		//
+		//var insutype string
+		//var is390 int = 0
+		//var is310 int = 0
+		//for _, item := range res2.Output.Iinfo {
+		//	if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+		//		insutypes = append(insutypes, item.Insutype)
+		//	}
+		//}
+		//if len(insutypes) == 1 {
+		//	insutype = insutypes[0]
+		//} else {
+		//	for _, i := range insutypes {
+		//		if i == "390" {
+		//			is390 = 1
+		//		}
+		//
+		//		if i == "310" {
+		//			is310 = 1
+		//		}
+		//	}
+		//}
+		//if is390 == 1 {
+		//	insutype = "390"
+		//}
+		//if is310 == 1 {
+		//	insutype = "310"
+		//}
+		//
+		//if len(insutypes) == 0 {
+		//	insutype = "310"
+		//}
 
 		timestamp := time.Now().Unix()
 		tempTime := time.Unix(timestamp, 0)
@@ -389,7 +474,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 		var struct2401 service.Struct2401
 		struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
-		struct2401.Insutype = insutype
+		struct2401.Insutype = strconv.FormatInt(int64(social_type), 10)
 		struct2401.MdtrtCertType = "02"
 		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
 		struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
@@ -473,7 +558,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 				Gend:                 res2.Output.Baseinfo.Gend,
 				Naty:                 res2.Output.Baseinfo.Naty,
 				MedType:              med_type,
-				InsutypeType:         insutype,
+				InsutypeType:         strconv.FormatInt(int64(social_type), 10),
 				Brdy:                 res2.Output.Baseinfo.Brdy,
 				Iinfo:                infoStr,
 				Idetinfo:             idetinfoStr,
@@ -489,6 +574,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 				Certificates:         certificates,
 				Phone:                phone,
 				BalanceAccountsType:  balance_accounts_type,
+				PsnType:              psn_type,
 			}
 			service.CreateHospitalRecord(inHospital)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -953,9 +1039,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 					//randNum = rand.Intn(10000) + 1000
 					if subItem.Type == 2 {
 						if len(subItem.HisProject.MedicalCode) > 0 {
+							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 							cus := &models.NewCustom{
-								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.HisProject.MedicalCode,
@@ -965,9 +1052,11 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						}
 					} else if subItem.Type == 3 {
 						if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+
 							cus := &models.NewCustom{
-								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.GoodInfo.MedicalInsuranceNumber,
@@ -1136,7 +1225,8 @@ func (c *ZHHisApiController) 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)
 						}
 					}
 				}

models/his_models.go

@@ -495,7 +495,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"`

models/zh_his_models.go

@@ -40,6 +40,7 @@ type HisHospitalCheckRecord struct {
 	OutWay               int64  `gorm:"column:out_way" json:"out_way" form:"out_way"`
 	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
 	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
 }
 
 func (HisHospitalCheckRecord) TableName() string {

service/gdyb_service.go

@@ -839,10 +839,10 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 				//randNum = rand.Intn(10000) + 1000
 				if subItem.Type == 2 {
 					if len(subItem.HisProject.MedicalCode) > 0 {
-
+						cnt, _ := 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*cnt),
+							Cut:              fmt.Sprintf("%.2f", cnt),
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.HisProject.MedicalCode,
@@ -855,9 +855,11 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 				} else if subItem.Type == 3 {
 					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+						cnt, _ := 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*cnt),
+							Cut:              fmt.Sprintf("%.2f", cnt),
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,

service/hbyb_service.go

@@ -298,10 +298,11 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 				//randNum = rand.Intn(10000) + 1000
 				if subItem.Type == 2 {
 					if len(subItem.HisProject.MedicalCode) > 0 {
+						cnt, _ := 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*cnt),
+							Cut:              fmt.Sprintf("%.2f", cnt),
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.HisProject.MedicalCode,
@@ -312,9 +313,11 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 				} else if subItem.Type == 3 {
 					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+						cnt, _ := 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*cnt),
+							Cut:              fmt.Sprintf("%.2f", cnt),
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,