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

controllers/sg/gdyb_controller.go

@@ -520,7 +520,7 @@ func (c *GdybController) PostZHFive() {
 		return
 	}
 	userJSONBytes, _ := json.Marshal(respJSON["pre"])
-	var hp []*models.HisPrescription
+	var hp []*models.NewCustom
 	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return

controllers/zh/zh_his_api_controller.go

@@ -11,6 +11,7 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"io/ioutil"
+	"math"
 	"math/rand"
 	"net/http"
 	"strconv"
@@ -241,6 +242,28 @@ type ResultEmpty struct {
 	WarnMsg     interface{} `json:"warn_msg"`
 }
 
+type CustomResult struct {
+	BasMednFlag      string  `json:"bas_medn_flag"`
+	ChldMedcFlag     string  `json:"chld_medc_flag"`
+	ChrgitmLv        string  `json:"chrgitm_lv"`
+	Cnt              float64 `json:"cnt"`
+	DetItemFeeSumamt float64 `json:"det_item_fee_sumamt"`
+	DrtReimFlag      string  `json:"drt_reim_flag"`
+	FeedetlSn        string  `json:"feedetl_sn"`
+	FulamtOwnpayAmt  float64 `json:"fulamt_ownpay_amt"`
+	HiNegoDrugFlag   string  `json:"hi_nego_drug_flag"`
+	InscpScpAmt      float64 `json:"inscp_scp_amt"`
+	ListSpItemFlag   string  `json:"list_sp_item_flag"`
+	LmtUsedFlag      string  `json:"lmt_used_flag"`
+	MedChrgitmType   string  `json:"med_chrgitm_type"`
+	Memo             string  `json:"memo"`
+	OverlmtAmt       float64 `json:"overlmt_amt"`
+	PreselfpayAmt    float64 `json:"preselfpay_amt"`
+	Pric             float64 `json:"pric"`
+	PricUplmtAmt     float64 `json:"pric_uplmt_amt"`
+	SelfpayProp      float64 `json:"selfpay_prop"`
+}
+
 func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/inhopitalcheck/get", &ZHHisApiController{}, "get:GetZHInHospitalCheck")
 	beego.Router("/zh/api/outhopitalcheck/get", &ZHHisApiController{}, "get:GetZHOutHospitalCheck")
@@ -818,7 +841,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
 		prescriptions, _ = service.GetZHHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
-		data["pre"] = prescriptions
 
 	} else { //月结
 		start_time_str := c.GetString("start_time")
@@ -840,7 +862,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		recordEndTime := theEndTime.Unix()
 		end_time = recordEndTime
 		prescriptions, _ = service.GetZHMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
-		data["pre"] = prescriptions
 
 	}
 
@@ -894,56 +915,157 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	}
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		bytesData, _ := json.Marshal(data)
-		req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/zh/five", bytes.NewReader(bytesData))
-		resp, _ := client.Do(req)
-		defer resp.Body.Close()
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
 
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
-		var res ResultFour
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		var pagesize int = 100
+		var start int = 1
+		var stop int
+		var pagecount int
+		var curpage int
+		var isSuccess bool = true
+
+		var customs []*models.NewCustom
 
-		var total float64
 		for _, item := range prescriptions {
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
-					total = total + (subItem.Price * subItem.PrescribingNumber)
+					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
+						//var randNum int
+						//randNum = rand.Intn(10000) + 1000
+						cus := &models.NewCustom{
+							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
+							Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.2f", subItem.Price),
+							MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
+							HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
+						}
+
+						customs = append(customs, cus)
+					}
 				}
 			}
+
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
-					total = total + (subItem.Price * float64(subItem.Count))
+					//var randNum int
+					//randNum = rand.Intn(10000) + 1000
+					if len(subItem.HisProject.MedicalCode) > 0 {
+
+						cus := &models.NewCustom{
+							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+							Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+							MedListCodg:      subItem.HisProject.MedicalCode,
+							HospApprFlag:     -1,
+						}
+						customs = append(customs, cus)
+					}
 				}
 			}
-		}
 
-		for _, item := range prescriptions {
 			for _, subItem := range item.HisAdditionalCharge {
-				total = total + (subItem.Price * float64(subItem.Count))
+				if len(subItem.XtHisAddtionConfig.Code) > 0 {
+					cus := &models.NewCustom{
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						MedListCodg:      subItem.XtHisAddtionConfig.Code,
+						HospApprFlag:     -1,
+					}
+					customs = append(customs, cus)
+				}
 			}
 		}
 
-		allTotal := fmt.Sprintf("%.2f", total)
+		//总页数,向上取整,注意除之前要先转换类型为float64
+		pagecount = int(math.Ceil(float64(len(customs)) / float64(pagesize)))
+		var ress []*ResultFour
+		for curpage = 1; curpage <= pagecount; curpage++ {
+			if curpage == 1 {
+				start = 1
+			} else {
+				start = (curpage-1)*pagesize + 1
+			}
+			stop = curpage * pagesize
+			if stop > len(customs) {
+				stop = len(customs)
+			}
+
+			data["pre"] = customs[start-1 : stop]
+			bytesData, _ := json.Marshal(data)
+			req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/zh/five", bytes.NewReader(bytesData))
+			resp, _ := client.Do(req)
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			var res ResultFour
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				ress = append(ress, &res)
+			} else {
+				isSuccess = false
+				errlog := &models.HisOrderError{
+					UserOrgId:  adminUser.CurrentOrgId,
+					Ctime:      time.Now().Unix(),
+					Mtime:      time.Now().Unix(),
+					Number:     chrg_bchno,
+					ErrMsg:     "",
+					Status:     1,
+					PatientId:  id,
+					RecordTime: recordDateTime,
+					Stage:      4,
+				}
+				service.CreateErrMsgLog(errlog)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         "上传明细错误,请联系his厂商",
+				})
+				return
+			}
+		}
+
+		if isSuccess == true {
+			var total float64
+			for _, item := range prescriptions {
+				if item.Type == 1 { //药品
+					for _, subItem := range item.HisDoctorAdviceInfo {
+						total = total + (subItem.Price * subItem.PrescribingNumber)
+					}
+				}
+				if item.Type == 2 { //项目
+					for _, subItem := range item.HisPrescriptionProject {
+						total = total + (subItem.Price * float64(subItem.Count))
+					}
+				}
+			}
+			for _, item := range prescriptions {
+				for _, subItem := range item.HisAdditionalCharge {
+					total = total + (subItem.Price * float64(subItem.Count))
+				}
+			}
+			allTotal := fmt.Sprintf("%.2f", total)
+			totals, _ := strconv.ParseFloat(allTotal, 64)
 
-		totals, _ := strconv.ParseFloat(allTotal, 64)
-		if res.Infcode == 0 {
 			order := &models.HisOrder{
 				UserOrgId:           adminUser.CurrentOrgId,
 				HisPatientId:        record.ID,
@@ -953,12 +1075,12 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				Mtime:               time.Now().Unix(),
 				Status:              1,
 				Number:              chrg_bchno,
-				Infcode:             res.Infcode,
-				WarnMsg:             res.WarnMsg,
-				Cainfo:              res.Cainfo,
-				ErrMsg:              res.ErrMsg,
-				RespondTime:         res.RefmsgTime,
-				InfRefmsgid:         res.InfRefmsgid,
+				Infcode:             0,
+				WarnMsg:             "",
+				Cainfo:              "",
+				ErrMsg:              "",
+				RespondTime:         "",
+				InfRefmsgid:         "",
 				OrderStatus:         1,
 				MdtrtId:             record.Number,
 				IsMedicineInsurance: 1,
@@ -975,82 +1097,66 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
 				return
 			}
-
-			for _, item := range res.Output.Result {
-				temp := strings.Split(item.FeedetlSn, "-")
-				var advice_id int64 = 0
-				var project_id int64 = 0
-				var types int64 = 0
-
-				id, _ := strconv.ParseInt(temp[2], 10, 64)
-				types, _ = strconv.ParseInt(temp[1], 10, 64)
-
-				if temp[1] == "1" {
-					advice_id = id
-					project_id = 0
-				} else if temp[1] == "2" {
-					advice_id = 0
-					project_id = id
-				}
-				info := &models.HisOrderInfo{
-					OrderNumber:      order.Number,
-					FeedetlSn:        item.FeedetlSn,
-					UploadDate:       time.Now().Unix(),
-					AdviceId:         advice_id,
-					DetItemFeeSumamt: item.DetItemFeeSumamt,
-					Cnt:              item.Cnt,
-					Pric:             float64(item.Pric),
-					PatientId:        record.PatientId,
-					PricUplmtAmt:     item.PricUplmtAmt,
-					SelfpayProp:      item.SelfpayProp,
-					FulamtOwnpayAmt:  item.FulamtOwnpayAmt,
-					OverlmtAmt:       item.OverlmtAmt,
-					PreselfpayAmt:    item.PreselfpayAmt,
-					BasMednFlag:      item.BasMednFlag,
-					MedChrgitmType:   item.MedChrgitmType,
-					HiNegoDrugFlag:   item.HiNegoDrugFlag,
-					Status:           1,
-					Memo:             item.Memo,
-					Mtime:            time.Now().Unix(),
-					InscpScpAmt:      item.InscpScpAmt,
-					DrtReimFlag:      item.DrtReimFlag,
-					Ctime:            time.Now().Unix(),
-					ListSpItemFlag:   item.ListSpItemFlag,
-					ChldMedcFlag:     item.ChldMedcFlag,
-					LmtUsedFlag:      item.LmtUsedFlag,
-					ChrgitmLv:        item.ChrgitmLv,
-					UserOrgId:        adminUser.CurrentOrgId,
-					HisPatientId:     record.ID,
-					OrderId:          order.ID,
-					ProjectId:        project_id,
-					Type:             types,
+			for _, subItem := range ress {
+				for _, item := range subItem.Output.Result {
+					temp := strings.Split(item.FeedetlSn, "-")
+					var advice_id int64 = 0
+					var project_id int64 = 0
+					var types int64 = 0
+
+					id, _ := strconv.ParseInt(temp[2], 10, 64)
+					types, _ = strconv.ParseInt(temp[1], 10, 64)
+
+					if temp[1] == "1" {
+						advice_id = id
+						project_id = 0
+					} else if temp[1] == "2" {
+						advice_id = 0
+						project_id = id
+					}
+					info := &models.HisOrderInfo{
+						OrderNumber:      order.Number,
+						FeedetlSn:        item.FeedetlSn,
+						UploadDate:       time.Now().Unix(),
+						AdviceId:         advice_id,
+						DetItemFeeSumamt: item.DetItemFeeSumamt,
+						Cnt:              item.Cnt,
+						Pric:             float64(item.Pric),
+						PatientId:        record.PatientId,
+						PricUplmtAmt:     item.PricUplmtAmt,
+						SelfpayProp:      item.SelfpayProp,
+						FulamtOwnpayAmt:  item.FulamtOwnpayAmt,
+						OverlmtAmt:       item.OverlmtAmt,
+						PreselfpayAmt:    item.PreselfpayAmt,
+						BasMednFlag:      item.BasMednFlag,
+						MedChrgitmType:   item.MedChrgitmType,
+						HiNegoDrugFlag:   item.HiNegoDrugFlag,
+						Status:           1,
+						Memo:             item.Memo,
+						Mtime:            time.Now().Unix(),
+						InscpScpAmt:      item.InscpScpAmt,
+						DrtReimFlag:      item.DrtReimFlag,
+						Ctime:            time.Now().Unix(),
+						ListSpItemFlag:   item.ListSpItemFlag,
+						ChldMedcFlag:     item.ChldMedcFlag,
+						LmtUsedFlag:      item.LmtUsedFlag,
+						ChrgitmLv:        item.ChrgitmLv,
+						UserOrgId:        adminUser.CurrentOrgId,
+						HisPatientId:     record.ID,
+						OrderId:          order.ID,
+						ProjectId:        project_id,
+						Type:             types,
+					}
+					service.CreateOrderInfo(info)
 				}
-				service.CreateOrderInfo(info)
 			}
 			service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
 			service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, chrg_bchno, recordDateTime)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "上传费用明细成功",
 			})
-		} else {
-			adminUser := c.GetAdminUserInfo()
-			errlog := &models.HisOrderError{
-				UserOrgId:  adminUser.CurrentOrgId,
-				Ctime:      time.Now().Unix(),
-				Mtime:      time.Now().Unix(),
-				ErrMsg:     res.ErrMsg,
-				Status:     1,
-				PatientId:  id,
-				RecordTime: recordDateTime,
-				Stage:      4,
-			}
-			service.CreateErrMsgLog(errlog)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"failed_code": -10,
-				"msg":         res.ErrMsg,
-			})
-			return
 		}
+
 	}
 }
 func (c *ZHHisApiController) ZHRefund() {

models/his_models.go

@@ -1240,3 +1240,13 @@ type HisFundSettleListResult struct {
 func (HisFundSettleListResult) TableName() string {
 	return "his_fund_settle_list_result"
 }
+
+type NewCustom struct {
+	DetItemFeeSumamt string
+	Cut              string
+	FeedetlSn        string
+	Price            string
+	MedListCodg      string
+	LmtUsedFlag      int64
+	HospApprFlag     int64
+}

service/zh_his_service.go

@@ -528,7 +528,7 @@ type ZHResult struct {
 }
 
 //  住院费用明细信息上传
-func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string) string {
+func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -538,62 +538,9 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.HisPresc
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	//chrgBchno := rand.Intn(100000) + 10000
 
-	var customs []*Custom
-
-	for _, item := range hisPrescription {
-		if item.Type == 1 { //药品
-			for _, subItem := range item.HisDoctorAdviceInfo {
-				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
-					//var randNum int
-					//randNum = rand.Intn(10000) + 1000
-					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", subItem.Price),
-						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
-						HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
-					}
-
-					customs = append(customs, cus)
-				}
-			}
-		}
-
-		if item.Type == 2 { //项目
-			for _, subItem := range item.HisPrescriptionProject {
-				//var randNum int
-				//randNum = rand.Intn(10000) + 1000
-				if len(subItem.HisProject.MedicalCode) > 0 {
-
-					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-						MedListCodg:      subItem.HisProject.MedicalCode,
-						HospApprFlag:     -1,
-					}
-					customs = append(customs, cus)
-				}
-			}
-		}
-
-		for _, subItem := range item.HisAdditionalCharge {
-			if len(subItem.XtHisAddtionConfig.Code) > 0 {
-				cus := &Custom{
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-					FeedetlSn:        subItem.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-					MedListCodg:      subItem.XtHisAddtionConfig.Code,
-					HospApprFlag:     -1,
-				}
-				customs = append(customs, cus)
-			}
-		}
-	}
+	var customs []*models.NewCustom
 
+	customs = hisPrescription
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})