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

controllers/hb/hbyb_controller.go

@@ -40,7 +40,7 @@ func (c *HBybController) Post3202a() {
 		return
 	}
 	userJSONBytes, _ := json.Marshal(respJSON["bps"])
-	var bps []models.BusinessParams
+	var bps []*models.BusinessParamsTwo
 	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return

controllers/js/jsyb_controller.go

@@ -664,7 +664,11 @@ func (c *JSybController) PostSeven() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 
-	result, request_log := service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number, cainfo)
+	var result string
+	var request_log string
+
+	result, request_log = service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number, cainfo)
+
 	saveJsLog(result, request_log, "2206", "预结算", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -713,7 +717,25 @@ func (c *JSybController) PostEight() {
 	verify_number := c.GetString("verify_number")
 	cainfo := c.GetString("cainfo")
 
-	result, request_log := service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+	var result string
+	var request_log string
+	if id_card_type == 4 {
+		_, pBusiCardInfo := GetELeCertInfoSettle(fixmedins_code, "", "")
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		var ele ELeData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcCardToken
+		if len(token) > 0 {
+			result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, token, cainfo)
+		}
+	} else {
+		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+
+	}
+
 	saveJsLog(result, request_log, "2207", "结算", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1024,12 +1046,14 @@ func (c *JSybController) ReadCard() {
 		token := ele.Data.EcToken
 		fmt.Println(token)
 		if len(token) > 0 {
-			userName := ConvertByte2String([]byte(ele.Data.UserName), GB18030)
+			userName := ele.Data.UserName
+			fmt.Println(userName)
 			userName = Remove0000(userName)
+			userName = DeleteExtraSpace(userName)
 			fmt.Println(userName)
 			enc := mahonia.NewEncoder("gbk")
 			fmt.Println(enc.ConvertString(userName))
-			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, enc.ConvertString(userName))
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1183,6 +1207,38 @@ func (c *JSybController) GetELeCertInfo(code string, operator_id string, operato
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
+func GetELeCertInfoSettle(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+	readCard := DllDef.MustFindProc("GetPersonInfo")
+
+	pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = "1"
+	inputData["operatorName"] = "admin"
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "admin"
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
+}
+
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }

controllers/sg/gdyb_controller.go

@@ -341,7 +341,7 @@ func (c *GdybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1, "0")
+	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1, "0", "")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -81,7 +81,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/90990", &HisApiController{}, "get:CheckCardPWDTwo")
 	beego.Router("/9001", &HisApiController{}, "get:Get9001")
 
-	beego.Router("/api/readelecard", &HisApiController{}, "get:ReadEleCard")
+	//beego.Router("/api/readelecard", &HisApiController{}, "get:ReadEleCard")
 
 	beego.Router("/api/3202", &HisApiController{}, "get:Post3202")
 
@@ -2293,66 +2293,65 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
-			c.GetEleBaseInfo()
-
-			//result, requestLog := service.Gdyb6101(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
-			//saveLog(result, requestLog, "6101", "电子凭证")
-			//var ele ELeCertData
-			//err := json.Unmarshal([]byte(result), &ele)
-			//if err != nil {
-			//	utils.ErrorLog("解析失败：%v", err)
-			//}
-			//result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, ele.Data.EcToken)
-			//saveLog(result2, requestLog2, "1101", "获取人员信息")
-			//
-			//var res ResultTwo
-			//if err := json.Unmarshal([]byte(result2), &res); err != nil {
-			//	utils.ErrorLog("解析失败：%v", err)
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			//	return
-			//}
-			//
-			//if res.Infcode == 0 {
-			//	patient, err := service.GetPatientByNumber(ele.Data.IDNo, c.GetAdminUserInfo().CurrentOrgId)
-			//	if err == gorm.ErrRecordNotFound {
-			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-			//		return
-			//	} else if err != nil {
-			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			//		return
-			//
-			//	} else {
-			//		Iinfos, _ := json.Marshal(res.Output.Iinfo)
-			//		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-			//		infoStr := string(Iinfos)
-			//		idetinfoStr := string(Idetinfos)
-			//		psn := &models.HisPsn{
-			//			PsnNo:        res.Output.Baseinfo.PsnNo,
-			//			Age:          res.Output.Baseinfo.Age,
-			//			PatientId:    patient.ID,
-			//			Certno:       res.Output.Baseinfo.Certno,
-			//			Brdy:         res.Output.Baseinfo.Brdy,
-			//			Gend:         res.Output.Baseinfo.Gend,
-			//			Naty:         res.Output.Baseinfo.Naty,
-			//			PsnCertType:  res.Output.Baseinfo.PsnCertType,
-			//			PsnName:      res.Output.Baseinfo.PsnName,
-			//			Idetinfo:     idetinfoStr,
-			//			Insuinfo:     infoStr,
-			//			UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-			//			CardInfo:     "",
-			//			VerifyNumber: ele.Data.EcToken,
-			//		}
-			//		service.CreateHisPsn(psn)
+
+			if initFlag == 0 {
+				c.TestGetBasBaseInit()
+			}
+			token := c.GetEleBaseInfo()
+
+			token = Remove0000(token)
+
+			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token)
+			saveLog(result2, requestLog2, "1101", "获取人员信息")
 			//
-			//		c.ServeSuccessJSON(map[string]interface{}{
-			//			"patient": patient,
-			//			"number":  ele.Data.EcToken,
-			//		})
-			//	}
-			//} else {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			//	return
-			//}
+			var res ResultTwo
+			if err := json.Unmarshal([]byte(result2), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByNumber(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
+				if err == gorm.ErrRecordNotFound {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+					return
+				} else if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+					return
+
+				} else {
+					Iinfos, _ := json.Marshal(res.Output.Iinfo)
+					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+					infoStr := string(Iinfos)
+					idetinfoStr := string(Idetinfos)
+					psn := &models.HisPsn{
+						PsnNo:        res.Output.Baseinfo.PsnNo,
+						Age:          res.Output.Baseinfo.Age,
+						PatientId:    patient.ID,
+						Certno:       res.Output.Baseinfo.Certno,
+						Brdy:         res.Output.Baseinfo.Brdy,
+						Gend:         res.Output.Baseinfo.Gend,
+						Naty:         res.Output.Baseinfo.Naty,
+						PsnCertType:  res.Output.Baseinfo.PsnCertType,
+						PsnName:      res.Output.Baseinfo.PsnName,
+						Idetinfo:     idetinfoStr,
+						Insuinfo:     infoStr,
+						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+						CardInfo:     "",
+						VerifyNumber: token,
+					}
+					service.CreateHisPsn(psn)
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  token,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
 			type ELeData struct {
@@ -2537,6 +2536,8 @@ func (c *HisApiController) GetSFZBaseInfo() string {
 func (c *HisApiController) GetEleBaseInfo() string {
 	DllDef := syscall.MustLoadDLL("SSCard.dll")
 	readCard := DllDef.MustFindProc("GetQRBase")
+	fmt.Println(readCard)
+
 	if readCard == nil {
 		fmt.Println("readcard is nil")
 		readCard = DllDef.MustFindProc("GetQRBase")
@@ -2544,6 +2545,7 @@ func (c *HisApiController) GetEleBaseInfo() string {
 	str := make([]byte, 1024)
 	str1 := make([]byte, 1024)
 	ret2, _, _ := readCard.Call(uintptr(180), (uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+	fmt.Println(ret2)
 	fmt.Println(string(str1))
 	fmt.Println(string(str))
 	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
@@ -2551,7 +2553,7 @@ func (c *HisApiController) GetEleBaseInfo() string {
 	if ret2 != 0 {
 		return ""
 	}
-	return string(str1)
+	return string(str)
 }
 
 func (c *HisApiController) GetBasBaseInfo() string {
@@ -3261,8 +3263,8 @@ func (c *HisApiController) GetSettleListHospital() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       order.FaPiaoCode,
-		BillNo:         order.FaPiaoCode,
+		BillCode:       order.FaPiaoNumber,
+		BillNo:         order.FaPiaoNumber,
 		BizSn:          order.Number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
@@ -3826,8 +3828,8 @@ func (c *HisApiController) GetBatchSettleList() {
 			HiType:         order.Insutype,
 			Insuplc:        his.InsuplcAdmdvs,
 			MaindiagFlag:   "1",
-			BillCode:       order.FaPiaoCode,
-			BillNo:         order.FaPiaoNumber,
+			BillCode:       order.SetlId,
+			BillNo:         order.SetlId,
 			BizSn:          order.Number,
 			PsnSelfPay:     order.PsnPartAmt,
 			PsnOwnPay:      order.PsnPartAmt,
@@ -5844,52 +5846,70 @@ func (c *HisApiController) GetRegisterInfo() {
 			var result string
 			var requestLog string
 			if miConfig.UserOrgId == 10138 {
-				if id_card_type == 4 {
-					psn_info, _ := service.GetPsnByPatientId(id)
-					result, requestLog = service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_info.VerifyNumber)
-				} else {
+				if id_card_type != 4 {
+					//psn_info, _ := service.GetPsnByPatientId(id)
+					//result, requestLog = service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_info.VerifyNumber)
 					result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
 				}
 			} else {
 				result, requestLog = service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
 			}
-			saveLog(result, requestLog, "1101", "人员基本信息获取")
-			if miConfig.Code == "H15049901371" {
 
-				if err := json.Unmarshal([]byte(result), &res10265); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-				res.ErrMsg = res10265.ErrMsg
-				res.Output = res10265.Output
-				res.InfRefmsgid = res10265.InfRefmsgid
+			if id_card_type == 4 {
+				psn_info, _ := service.GetPsnByPatientId(id)
+				PsnNo = psn_info.PsnNo
+				PsnCertType = psn_info.PsnCertType
+				Certno = psn_info.Certno
+				PsnName = psn_info.PsnName
+				Gend = psn_info.Gend
+				Naty = psn_info.Naty
+				Brdy = psn_info.Brdy
+				Age = psn_info.Age
+				infoStr = psn_info.Insuinfo
+				idetinfoStr = psn_info.Idetinfo
+				infocode = 0
+				verify_number = psn_info.VerifyNumber
 
 			} else {
-				if err := json.Unmarshal([]byte(result), &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
+				saveLog(result, requestLog, "1101", "人员基本信息获取")
+				if miConfig.Code == "H15049901371" {
+
+					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.ErrMsg = res10265.ErrMsg
+					res.Output = res10265.Output
+					res.InfRefmsgid = res10265.InfRefmsgid
+
+				} else {
+					if err := json.Unmarshal([]byte(result), &res); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+				PsnNo = res.Output.Baseinfo.PsnNo
+				PsnCertType = res.Output.Baseinfo.PsnCertType
+				Certno = res.Output.Baseinfo.Certno
+				PsnName = res.Output.Baseinfo.PsnName
+				Gend = res.Output.Baseinfo.Gend
+				Naty = res.Output.Baseinfo.Naty
+				Brdy = res.Output.Baseinfo.Brdy
+				Age = res.Output.Baseinfo.Age
+				Iinfos, _ := json.Marshal(res.Output.Iinfo)
+				Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+				infoStr = string(Iinfos)
+				idetinfoStr = string(Idetinfos)
+				if miConfig.Code == "H15049901371" {
+					infocode, _ = strconv.ParseInt(res10265.Infcode, 10, 64)
+				} else {
+					infocode = res.Infcode
 				}
-			}
 
-			PsnNo = res.Output.Baseinfo.PsnNo
-			PsnCertType = res.Output.Baseinfo.PsnCertType
-			Certno = res.Output.Baseinfo.Certno
-			PsnName = res.Output.Baseinfo.PsnName
-			Gend = res.Output.Baseinfo.Gend
-			Naty = res.Output.Baseinfo.Naty
-			Brdy = res.Output.Baseinfo.Brdy
-			Age = res.Output.Baseinfo.Age
-			Iinfos, _ := json.Marshal(res.Output.Iinfo)
-			Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-			infoStr = string(Iinfos)
-			idetinfoStr = string(Idetinfos)
-			if miConfig.Code == "H15049901371" {
-				infocode, _ = strconv.ParseInt(res10265.Infcode, 10, 64)
-			} else {
-				infocode = res.Infcode
 			}
+
 		}
 		if infocode == 0 {
 			his := models.VMHisPatient{
@@ -6190,7 +6210,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
 				psn_info, _ := service.GetPsnByPatientId(id)
-				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
+				result, requestLog := service.Gdyb2201A(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
 				saveLog(result, requestLog, "2201A", "挂号")
 				if miConfig.Code == "H15049901371" {
 
@@ -7273,9 +7293,19 @@ func (c *HisApiController) GetUploadInfo() {
 										med_type = "11"
 									}
 								}
-								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "")
 							} else {
-								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+								if his.IdCardType == 4 {
+									psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+									var token string
+									token = psn_info.VerifyNumber
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, token)
+
+								} else {
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "")
+
+								}
+
 							}
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
@@ -7726,9 +7756,18 @@ func (c *HisApiController) GetUploadInfo() {
 							med_type = "11"
 						}
 					}
-					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "")
 				} else {
-					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+					if his.IdCardType == 4 {
+						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+						token := psn_info.VerifyNumber
+						result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, token)
+
+					} else {
+
+						result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "")
+
+					}
 				}
 
 				var dat map[string]interface{}
@@ -10282,6 +10321,8 @@ func (c *HisApiController) GetCheckAccount() {
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
+	orders_two, _ := service.GetOrderByTimeFive(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
+
 	fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
 	var acct_pay float64
@@ -10311,7 +10352,7 @@ func (c *HisApiController) GetCheckAccount() {
 				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
 				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
 				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
-				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt+int64(len(orders_two)*2), 10) +
 				"&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -10359,14 +10400,14 @@ func (c *HisApiController) GetCheckAccount() {
 
 			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + clr_type +
+				"&clr_type=" + "21" +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
 				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
 				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
 				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
-				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt+int64(len(orders_two)*2), 10) +
 				"&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -10432,7 +10473,7 @@ func (c *HisApiController) GetCheckAccount() {
 				MedfeeSumamt:     medfee_sumamt,
 				FundPaySumamt:    fund_pay_sumamt,
 				AcctPay:          acct_pay,
-				FixmedinsSetlCnt: fixmedins_setl_cnt,
+				FixmedinsSetlCnt: fixmedins_setl_cnt + int64(len(orders_two)*2),
 			}
 			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams)
 			fmt.Println(requestLog)
@@ -13128,7 +13169,7 @@ func ConvertToString(src string, srcCode string, tagCode string) string {
 func ReadEleCard(admin_user_id int64, org_id int64, c *HisApiController) string {
 	roles, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-
+	var token string
 	if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 		var api string
 		if miConfig.MdtrtareaAdmvs == "320921" {
@@ -13162,7 +13203,7 @@ func ReadEleCard(admin_user_id int64, org_id int64, c *HisApiController) string
 		var status string
 		status = respJSON["data"].(map[string]interface{})["status"].(string)
 		//card_type := respJSON["data"].(map[string]interface{})["type"].(string)
-		var token string
+
 		var res ResultTwo           //1101结果
 		var res10265 ResultTwo10265 //1101结果
 		if status == "0" {          //读卡成功
@@ -13229,6 +13270,7 @@ func ReadEleCard(admin_user_id int64, org_id int64, c *HisApiController) string
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 		return ""
 	}
+	return token
 }
 
 func DeleteExtraSpaceTwo(s string) string {
@@ -13327,36 +13369,30 @@ func (c *HisApiController) Post3202() {
 	loc, _ := time.LoadLocation("Local")
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "390", "", clr_type)
-	orders_two, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "310", "", clr_type)
+	orders, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId)
+	//orders_two, _ := service.GetOrderByTimeFour(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, "310", "", clr_type)
 
 	//fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64
 
-	var medfee_sumamt_str string
-	var acct_pay_str string
-	var fund_pay_sumamt_str string
 	for _, item := range orders {
-		medfee_sumamt_str = fmt.Sprintf("%.4f", medfee_sumamt+item.MedfeeSumamt)
-		acct_pay_str = fmt.Sprintf("%.4f", acct_pay+item.AcctPay)
-		fund_pay_sumamt_str = fmt.Sprintf("%.4f", fund_pay_sumamt+item.FundPaySumamt)
+		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
+		acct_pay = acct_pay + item.AcctPay
+		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
 
 	}
 
-	var medfee_sumamt_two float64
-	var acct_pay_two float64
-	var fund_pay_sumamt_two float64
+	//var medfee_sumamt_two float64
+	//var acct_pay_two float64
+	//var fund_pay_sumamt_two float64
 
-	var medfee_sumamt_two_str string
-	var acct_pay_two_str string
-	var fund_pay_sumamt_two_str string
-	for _, item := range orders_two {
-		medfee_sumamt_two_str = fmt.Sprintf("%.4f", medfee_sumamt_two+item.MedfeeSumamt)
-		acct_pay_two_str = fmt.Sprintf("%.4f", acct_pay_two+item.AcctPay)
-		fund_pay_sumamt_two_str = fmt.Sprintf("%.4f", fund_pay_sumamt_two+item.FundPaySumamt)
-	}
+	//for _, item := range orders_two {
+	//	medfee_sumamt_two = medfee_sumamt_two + item.MedfeeSumamt
+	//	acct_pay_two = acct_pay_two + item.AcctPay
+	//	fund_pay_sumamt_two = fund_pay_sumamt_two + item.FundPaySumamt
+	//}
 
 	//var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
@@ -13367,36 +13403,21 @@ func (c *HisApiController) Post3202() {
 	//}
 	var res ResultSix
 	if config.IsOpen == 1 {
-		var bps []models.BusinessParams
-		var bp models.BusinessParams
-		ms, _ := strconv.ParseFloat(medfee_sumamt_str, 64)
-		ap, _ := strconv.ParseFloat(acct_pay_str, 64)
-		fp, _ := strconv.ParseFloat(fund_pay_sumamt_str, 64)
-
-		bp.MedfeeSumamt = ms
-		bp.AcctPay = ap
-		bp.FundPaySumamt = fp
+		var bps []*models.BusinessParamsTwo
+		var bp models.BusinessParamsTwo
+		medfee_sumamt_str := fmt.Sprintf("%.2f", medfee_sumamt)
+		acct_pay_str := fmt.Sprintf("%.2f", acct_pay)
+		fund_pay_sumamt_str := fmt.Sprintf("%.2f", fund_pay_sumamt)
+
+		bp.MedfeeSumamt = medfee_sumamt_str
+		bp.AcctPay = acct_pay_str
+		bp.FundPaySumamt = fund_pay_sumamt_str
 		bp.Insutype = "390"
 		bp.StmtBegndate = start_time
 		bp.ClrType = clr_type
 		bp.SetlOptins = clr_org
 		bp.StmtEnddate = end_time
-		bps = append(bps, bp)
-
-		mst, _ := strconv.ParseFloat(medfee_sumamt_two_str, 64)
-		apt, _ := strconv.ParseFloat(acct_pay_two_str, 64)
-		fpt, _ := strconv.ParseFloat(fund_pay_sumamt_two_str, 64)
-
-		var bp2 models.BusinessParams
-		bp2.MedfeeSumamt = mst
-		bp2.AcctPay = apt
-		bp2.FundPaySumamt = fpt
-		bp2.Insutype = "310"
-		bp2.StmtBegndate = start_time
-		bp2.StmtEnddate = end_time
-		bp2.ClrType = clr_type
-		bp2.SetlOptins = clr_org
-		bps = append(bps, bp2)
+		bps = append(bps, &bp)
 
 		data := make(map[string]interface{})
 		data["bps"] = bps

controllers/zh/zh_his_api_controller.go

@@ -2495,7 +2495,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	department, _ := service.GetDepartMentDetail(record.Departments)
 	strconv.FormatInt(record.PatientId, 10)
 
-	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, record.Doctor)
+	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.Creator)
 
 	//client := &http.Client{}
 	data["psn_no"] = record.PsnNo
@@ -2574,6 +2574,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 							HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
 							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+							DoctorId:         item.Creator,
 						}
 
 						customs = append(customs, cus)
@@ -2596,6 +2597,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								MedListCodg:      subItem.HisProject.MedicalCode,
 								HospApprFlag:     -1,
 								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+								DoctorId:         item.Creator,
 							}
 							customs = append(customs, cus)
 						}
@@ -2611,6 +2613,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 								HospApprFlag:     -1,
 								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+								DoctorId:         item.Creator,
 							}
 							customs = append(customs, cus)
 						}
@@ -2691,7 +2694,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				result_byte, _ := json.Marshal(respJSON)
 				result = string(result_byte)
 			} else {
-				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string), doctor_info.DoctorNumber, doctor_info.UserName)
+				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string), doctor_info.UserName, doctor_info.DoctorNumber)
 				saveLog(result, requestLog, "2301", "上传明细")
 			}
 

main.go

@@ -6,15 +6,13 @@ import (
 
 	//"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
-
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
 	//"github.com/qiniu/roapi.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	//"strconv"
 	//"time"

models/his_models.go

@@ -1033,6 +1033,24 @@ type BusinessParams struct {
 	SetlId           string
 }
 
+type BusinessParamsTwo struct {
+	Insutype         string
+	ClrType          string
+	SetlOptins       string
+	MdtrtareaAdmvs   string
+	StmtBegndate     string
+	StmtEnddate      string
+	MedfeeSumamt     string
+	FundPaySumamt    string
+	AcctPay          string
+	FixmedinsSetlCnt int64
+	FileQuryNo       string
+	CashPayamt       float64
+	PsnNo            string
+	MdtrtId          string
+	SetlId           string
+}
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -1291,6 +1309,7 @@ type NewCustom struct {
 	LmtUsedFlag      int64
 	HospApprFlag     int64
 	FeeOcurTime      string
+	DoctorId         int64
 }
 
 type HisPsn struct {

routers/router.go

@@ -3,7 +3,10 @@ package routers
 import (
 	"gdyb/controllers/hb"
 	"gdyb/controllers/js"
+	"gdyb/controllers/nm"
 	"gdyb/controllers/sg"
+	"gdyb/controllers/zh"
+
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -25,9 +28,9 @@ func init() {
 	sg.GdybRegistRouters()
 	hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
-	//zh.ZHHisManagerApiRegistRouters()
+	zh.ZHHisManagerApiRegistRouters()
 	js.JSybRegistRouters()
-	//nm.NmybRegistRouters()
+	nm.NmybRegistRouters()
 	//coordinate.CoordinateRegistRouters()
 
 }

service/fj_service.go

@@ -837,7 +837,7 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt       //基金支付总额
 	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
-	inputData["refd_setl_flag"] = 0                                   // 就诊 ID（来自2201接口返回）
+	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -2455,7 +2455,7 @@ func GetFjBusinessHandleInfo(inputStr []byte) (string, string) {
 		fmt.Println("readcard is nil")
 		readCard = DllDef.MustFindProc("read_cardinfo")
 	}
-	outputStr := make([]byte, 12288)
+	outputStr := make([]byte, 1002288)
 	errMessageStr := make([]byte, 2048)
 	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&inputStr[0])), uintptr(20000), (uintptr)(unsafe.Pointer(&outputStr[0])), (uintptr)(unsafe.Pointer(&errMessageStr[0])))
 

service/gdyb_service.go

@@ -1291,7 +1291,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string) (string, string) {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, token string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1310,9 +1310,13 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = token  // 就诊凭证编号
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 		}
 	}
 	if med_type == "1111" || med_type == "1112" {

service/hbyb_service.go

@@ -875,7 +875,7 @@ func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Hbyb3202a(baseParams models.BaseParams, businessParams []models.BusinessParams) string {
+func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -886,20 +886,20 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []models.BusinessPar
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
 	//inputDatas := []make(map[string]interface{})
 	inputDatas := make([]map[string]interface{}, 0)
 
 	inputMessage["infno"] = "3202a" // 交易编码
 	for _, item := range businessParams {
-		inputData["insutype"] = item.Insutype             // 险种
-		inputData["clr_type"] = item.ClrType              // 就诊 ID（来自2201接口返回）
-		inputData["setl_optins"] = item.SetlOptins        // 结算经办机构
+		inputData := make(map[string]interface{})
+		inputData["insutype"] = ""                        // 险种
+		inputData["clr_type"] = ""                        // 就诊 ID（来自2201接口返回）
+		inputData["setl_optins"] = ""                     // 结算经办机构
 		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
-		inputData["med_type"] = "14"                      //个人账户支付金额
+		inputData["med_type"] = ""                        //个人账户支付金额
 		inputDatas = append(inputDatas, inputData)
 	}
 	input["clrdata"] = inputDatas

service/his_service.go

@@ -991,9 +991,22 @@ func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype str
 	return
 }
 
-func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+func GetOrderByTimeFive(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
-	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
+	db = db.Where("user_org_id = ?  AND order_status = 3 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
+	if len(clr_org) > 0 {
+		db = db.Where("clr_optins = ?", clr_org)
+	}
+	if len(clr_type) > 0 {
+		db = db.Where("clr_type = ?", clr_type)
+	}
+	err = db.Find(&orders).Error
+	return
+}
+
+func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? ", org_id, end_time, start_time)
 	err = db.Find(&orders).Error
 	return
 }
@@ -1399,7 +1412,7 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' AND med_type = '14' AND setl_time >= '2022-07-30 00:00:00' AND setl_time <= '2022-07-31 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-05-01 00:00:00' AND setl_time <= '2022-06-01 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {

service/zh_his_service.go

@@ -38,13 +38,13 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "1"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "1"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 		}
 	}
 
@@ -575,6 +575,9 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 
 	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
 	for _, item := range customs {
+		org_id, _ := beego.AppConfig.Int64("org_id")
+		doctor_info, _ := GetAdminUserInfoByID(org_id, item.DoctorId)
+
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
 		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
@@ -588,20 +591,20 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 		feedetailInfo["pric"] = item.Price                           // 单价
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = doctor_number                // 开单医生编码
-		feedetailInfo["bilg_dr_name"] = doctor_name
-		feedetailInfo["acord_dept_codg"] = dept_code    // 受单科室编码
-		feedetailInfo["acord_dept_name"] = dept         // 受单科室名称
-		feedetailInfo["orders_dr_code"] = doctor_number // 受单医生编码
-		feedetailInfo["orders_dr_name"] = doctor_name   // 受单医生姓名
-		feedetailInfo["chrg_bchno"] = chrg_bchno        // 收费批次号
-		feedetailInfo["dise_codg"] = ""                 // 病种编码
-		feedetailInfo["rxno"] = ""                      // 处方号
-		feedetailInfo["rx_circ_flag"] = "0"             // 外购处方标志
-		feedetailInfo["sin_dos_dscr"] = ""              // 单次剂量描述
-		feedetailInfo["used_frqu_dscr"] = ""            // 使用频次描述
-		feedetailInfo["prd_days"] = "0"                 // 周期天数
-		feedetailInfo["medc_way_dscr"] = ""             // 用药途径描述
+		feedetailInfo["bilg_dr_codg"] = doctor_info.DoctorNumber     // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor_info.UserName
+		feedetailInfo["acord_dept_codg"] = dept_code               // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept                    // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_info.DoctorNumber // 受单医生编码
+		feedetailInfo["orders_dr_name"] = doctor_info.UserName     // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno                   // 收费批次号
+		feedetailInfo["dise_codg"] = ""                            // 病种编码
+		feedetailInfo["rxno"] = ""                                 // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"                        // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""                         // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""                       // 使用频次描述
+		feedetailInfo["prd_days"] = "0"                            // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""                        // 用药途径描述
 		// 开单医师姓名
 
 		if item.HospApprFlag != -1 {