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

controllers/sg/his_api_controller.go

@@ -34,8 +34,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-	"github.com/go-ole/go-ole"
-
 )
 
 type HisApiController struct {
@@ -5380,7 +5378,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.Bchno = "---"
 	struct3505.FixmedinsCode = miConfig.Code
 	struct3505.Code = miConfig.Code
-	struct3505.FinlTrnsPric =  strconv.FormatFloat(drug.HisDoctorAdviceInfo.Price, 'f', -1, 64)
+	struct3505.FinlTrnsPric = strconv.FormatFloat(drug.HisDoctorAdviceInfo.Price, 'f', -1, 64)
 
 	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
 	struct3505.PrscDrName = roles.UserName
@@ -5494,8 +5492,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 
 	}
 
-
-	if org_id == 10610 || org_id == 10278 || org_id == 10138 || org_id == 10537{
+	if org_id == 10610 || org_id == 10278 || org_id == 10138 || org_id == 10537 {
 
 		if drug.HisDoctorAdviceInfo.BaseDrugLib.IsZeroFlag == 1 {
 			struct3505.TrdnFlag = "1"
@@ -5508,8 +5505,6 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 
 	}
 
-
-
 	struct3505.RtalDocno = order.Number
 	struct3505.PsnCertType = "01"
 
@@ -8085,7 +8080,7 @@ func (c *HisApiController) GetCFYLJG001() {
 			drug.MedinsListCodg = subItem.BaseDrugLib.MedicalInsuranceNumber
 			drug.RxItemTypeCode = "11"
 
-			drug.DrugDosform = "乳膏剂" //TODO
+			drug.DrugDosform = "剂" //TODO
 			if subItem.BaseDrugLib.MinUnit != subItem.BaseDrugLib.DoseUnit {
 				drug.DrugSpec = subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
 			}
@@ -8157,18 +8152,6 @@ func (c *HisApiController) GetCFYLJG001() {
 		cFYLJG001.Mdtrtinfo.MaindiagCode = "N18.500"
 		cFYLJG001.Mdtrtinfo.MaindiagName = "慢性肾脏病5期"
 
-		//memo := make(map[string]interface{})
-		//inputData := make(map[string]interface{}, 0)
-
-		//type MyData struct {
-		//	Insutype string `json:"insutype"`
-		//}
-		//
-		//	data := MyData{
-		//	Insutype: his.Insutype,
-		//}
-		//
-
 		diagnosis_ids := strings.Split(info.Diagnosis, ",")
 		var config []*models.HisXtDiagnoseConfig
 		for _, item := range diagnosis_ids {
@@ -8208,8 +8191,49 @@ func (c *HisApiController) GetCFYLJG001() {
 			}
 		}
 		if miConfig.MdtrtareaAdmvs == "340699" {
-			//result, request := service.GetAHCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001, his.Insutype)
-			//saveLog(result, request, "GetCFYLJG001", "GetCFYLJG001")
+			result, request := service.GetAHCFYLJG001("http://10.66.149.64:8080/epc/api", cFYLJG001, his.Insutype)
+			saveLog(result, request, "GetCFYLJG001", "GetCFYLJG001")
+			var res ResultCFYLJG001
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == -1 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+				return
+
+			} else {
+				var flow models.HisPrescriptionFlow
+				flow.Ctime = time.Now().Unix()
+				flow.SignDigest = ""
+				flow.RxTraceCode = res.Output.RxTraceCode
+				flow.HiRxno = res.Output.HiRxno
+				flow.MID = his.Number
+				flow.Status = 1
+				flow.DCode = doctor_info.DoctorNumber
+				flow.OriginalRxFile = ""
+				flow.OriginalValue = ""
+				flow.SignCertDn = ""
+				flow.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+				flow.SignCertSn = ""
+				flow.Mtime = time.Now().Unix()
+
+				service.Createflow(&flow)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "上传成功",
+				})
+			}
 
 		} else {
 			result, request := service.GetCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001, his.Insutype)
@@ -8246,7 +8270,7 @@ func (c *HisApiController) GetCFYLJG001() {
 				flow.OriginalRxFile = ""
 				flow.OriginalValue = ""
 				flow.SignCertDn = ""
-				flow.UserOrgId = 10454
+				flow.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
 				flow.SignCertSn = ""
 				flow.Mtime = time.Now().Unix()
 
@@ -8257,9 +8281,9 @@ func (c *HisApiController) GetCFYLJG001() {
 			}
 		}
 
-
 	}
 }
+
 func (c *HisApiController) GetCFYLJG002() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
@@ -8330,9 +8354,42 @@ func (c *HisApiController) GetCFYLJG002() {
 	fmt.Println(err)
 
 	if miConfig.MdtrtareaAdmvs == "340699" {
-		//result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
-		//saveLog(result, request, "GetCFYLJG002", "GetCFYLJG002")
+		result, request := service.GetAHCFYLJG002(miConfig.Code, "http://10.66.149.64:8080/epc/api", encoded, rx_encoded, "")
+		saveLog(result, request, "GetCFYLJG002", "GetCFYLJG002")
 
+		var res2 Result002
+		var respJSON2 map[string]interface{}
+		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		userJSONBytes2, _ := json.Marshal(respJSON2)
+		if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res2.Infcode == 0 {
+			flow.Ctime = time.Now().Unix()
+			flow.SignDigest = res2.Output.SignDigest
+			flow.RxFile = res2.Output.RxFile
+			flow.MID = his.Number
+			flow.Status = 1
+			flow.DCode = doctor_info.DoctorNumber
+			flow.OriginalRxFile = rx_encoded
+			flow.OriginalValue = encoded
+			flow.SignCertDn = res2.Output.SignCertDn
+			flow.SignCertSn = res2.Output.SignCertSn
+			flow.Mtime = time.Now().Unix()
+			service.Saveflow(flow)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "预签名成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	} else {
 		result, request := service.GetCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
 		//result, request := service.GetCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001,his.Insutype)
@@ -8414,15 +8471,26 @@ func (c *HisApiController) GetCFYLJG003() {
 	cFYLJG003.Certno = his.Certno
 	cFYLJG003.FixmedinsName = miConfig.OrgName
 	cFYLJG003.FixmedinsCode = miConfig.Code
-
 	cFYLJG003.DrCode = doctor_info.DoctorNumber
 	cFYLJG003.PrscDrName = doctor_info.UserName
 	cFYLJG003.PharDeptName = dept.Name
 	cFYLJG003.PharDeptCode = dept.Number
-	cFYLJG003.PharCode = "HY440309002107"
-	cFYLJG003.PharCertType = "01"
-	cFYLJG003.PharCertno = "430482199408260023"
-	cFYLJG003.PharName = "彭斯遥"
+
+	if c.GetAdminUserInfo().CurrentOrgId == 10721 {
+		cFYLJG003.PharName = "孙莉侠"
+		cFYLJG003.PharPracCertNo = "060399"
+		cFYLJG003.PharCode = "HY440309002107"
+		cFYLJG003.PharCertType = "01"
+		cFYLJG003.PharCertno = "430482199408260023"
+	} else {
+		cFYLJG003.PharName = "彭斯遥"
+		cFYLJG003.PharPracCertNo = "30220200943042010052"
+		cFYLJG003.PharCode = "HY440309002107"
+		cFYLJG003.PharCertType = "01"
+		cFYLJG003.PharCertno = "430482199408260023"
+
+	}
+
 	cFYLJG003.PsnCertType = "01"
 	cFYLJG003.RxFile = flow.RxFile
 	cFYLJG003.SignDigest = flow.SignDigest
@@ -8436,9 +8504,32 @@ func (c *HisApiController) GetCFYLJG003() {
 	cFYLJG003.PharChkTime = timeFormatTwo
 
 	if miConfig.MdtrtareaAdmvs == "340699" {
-		//result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
-		//result, request := service.GetAHCFYLJG003(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG003)
-		//saveLog(result, request, "GetAHCFYLJG003", "GetAHCFYLJG003")
+		result, request := service.GetAHCFYLJG003("http://10.66.149.64:8080/epc/api", cFYLJG003)
+		saveLog(result, request, "GetAHCFYLJG003", "GetAHCFYLJG003")
+		var res ResultCFYLJG003
+		var respJSON2 map[string]interface{}
+		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		userJSONBytes2, _ := json.Marshal(respJSON2)
+		if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res.Infcode == -1 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"info": res.Output,
+			})
+		}
 	} else {
 		result, request := service.GetCFYLJG003(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG003)
 		saveLog(result, request, "GetCFYLJG003", "GetCFYLJG003")
@@ -8469,7 +8560,6 @@ func (c *HisApiController) GetCFYLJG003() {
 
 	}
 
-
 }
 func (c *HisApiController) GetCFYLJG004() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -8545,7 +8635,6 @@ func (c *HisApiController) GetCFYLJG004() {
 		}
 	}
 
-
 }
 func (c *HisApiController) GetCFYLJG005() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -8606,7 +8695,6 @@ func (c *HisApiController) GetCFYLJG005() {
 		}
 	}
 
-
 }
 func (c *HisApiController) GetCFYLJG006() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -8664,7 +8752,6 @@ func (c *HisApiController) GetCFYLJG006() {
 		}
 	}
 
-
 }
 func (c *HisApiController) GetCFYLJG007() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -8723,7 +8810,6 @@ func (c *HisApiController) GetCFYLJG007() {
 		}
 	}
 
-
 }
 
 func (c *HisApiController) GetCFYLJG008() {
@@ -9165,8 +9251,6 @@ func (c *HisApiController) Get3103() {
 	}
 }
 
-
-
 func (c *HisApiController) Get4201A() {
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -14849,7 +14933,7 @@ func (c *HisApiController) ReadCard() {
 			fmt.Println(card_sn)
 			patient, _ := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
 
-			result, _ := service.Jxyb11012(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, patient.Name,card)
+			result, _ := service.Jxyb11012(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, "1", miConfig.Url, miConfig.AccessKey, patient.Name, card)
 
 			//result := service.Jxyb1101(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
 			var dat map[string]interface{}
@@ -15236,8 +15320,6 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 
-
-
 		} else if miConfig.MdtrtareaAdmvs == "430800" {
 			fmt.Println(initFlag)
 			fmt.Println("initFlag")
@@ -27530,7 +27612,7 @@ func (c *HisApiController) GetRegisterInfo() {
 					}
 					var result string
 					var requestLog string
-					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" ||  miConfig.Code == "H44082500483" {
+					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" {
 						var hisPrescription []*models.HisPrescription
 						res3101 := Checkgd3101ForOne(c, patient.ID, his, admin_user_id, "1", record_time, hisPrescription, department)
 						if res3101.Infcode == 0 {
@@ -27659,8 +27741,6 @@ func (c *HisApiController) GetRegisterInfo() {
 
 						for _, item := range rf {
 
-
-
 							if item.Insutype == insutype {
 								insuplc_admdvs_temp = item.InsuplcAdmdvs
 
@@ -27668,10 +27748,9 @@ func (c *HisApiController) GetRegisterInfo() {
 
 						}
 
-						if len(insuplc_admdvs_tt) > 0{
+						if len(insuplc_admdvs_tt) > 0 {
 							insuplc_admdvs_temp = insuplc_admdvs_tt
 
-
 						}
 
 						result, requestLog = service.Gdyb2201A(psn_info.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_two, psn_info.VerifyNumber, admin_user_id)
@@ -31132,7 +31211,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 					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, "", admin_user_id)
 				} else {
-					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" ||  miConfig.Code == "H44082500483" {
+					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" {
 						result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "7", tempOrder.ID)
 						if result3101.Infcode == 0 {
 							if len(result3101.Output.Result) > 0 {
@@ -33123,7 +33202,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						res.Infcode = infocode
 
 					} else {
-						if miConfig.Code == "H44030903432" || miConfig.Code == "H44030501364" || miConfig.Code == "H44030500255"  ||  miConfig.Code == "H44082500483"{
+						if miConfig.Code == "H44030903432" || miConfig.Code == "H44030501364" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" {
 							result3101 := Checkgd3101(c, id, his_patient_id, admin_user_id, "2", record_time, prescriptions)
 							if result3101.Infcode == 0 {
 								if len(result3101.Output.Result) > 0 {
@@ -34593,7 +34672,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							allTotal = fmt.Sprintf("%.2f", total_two)
-							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" ||  miConfig.Code == "H44082500483" {
+							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" {
 
 								result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
 								if result3101.Infcode == 0 {
@@ -40029,7 +40108,7 @@ func (c *HisApiController) GetSettleAccounts() {
 		res.Output.Setlinfo.PsnCashPay = order.PsnCashPay
 
 		if res.Infcode == 0 {
-			if adminUser.CurrentOrgId == 10215 || adminUser.CurrentOrgId == 10387 || adminUser.CurrentOrgId == 9919 || adminUser.CurrentOrgId == 10088 || adminUser.CurrentOrgId == 10150 || adminUser.CurrentOrgId == 10454 || adminUser.CurrentOrgId == 10644 || adminUser.CurrentOrgId == 10653 || adminUser.CurrentOrgId == 10210{
+			if adminUser.CurrentOrgId == 10215 || adminUser.CurrentOrgId == 10387 || adminUser.CurrentOrgId == 9919 || adminUser.CurrentOrgId == 10088 || adminUser.CurrentOrgId == 10150 || adminUser.CurrentOrgId == 10454 || adminUser.CurrentOrgId == 10644 || adminUser.CurrentOrgId == 10653 || adminUser.CurrentOrgId == 10210 {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"diagnosis":            name,
 					"order_infos":          orderInfos,

service/ah_dianzichufang.go

@@ -7,20 +7,10 @@ import (
 	"gdyb/models"
 	"io/ioutil"
 	"net/http"
-	//"strconv"
-	"time"
-
-
+	"os/exec"
 )
 
-func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, cFYLJG001 models.CFYLJG001, isu string, cainfo string) (string, string) {
-	// 生成签名
-	timestamp := time.Now().Unix()
-	//tempTime := time.Unix(timestamp, 0)
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-
-	// 生成输入报文
-	inputMessage := SetAHInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+func GetAHCFYLJG001(url string, cFYLJG001 models.CFYLJG001, isu string) (string, string) {
 	inputData := make(map[string]interface{}, 0)
 	inputData["mdtrtCertType"] = cFYLJG001.MdtrtCertType
 	inputData["mdtrtCertNo"] = cFYLJG001.MdtrtCertNo
@@ -46,17 +36,11 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 	inputData["valiDays"] = cFYLJG001.ValiDays
 	inputData["valiEndTime"] = cFYLJG001.ValiEndTime
 	inputData["reptFlag"] = cFYLJG001.ReptFlag
-
 	inputData["maxReptCnt"] = cFYLJG001.MaxReptCnt
 	inputData["minInrvDays"] = cFYLJG001.MinInrvDays
 	inputData["rxCotnFlag"] = cFYLJG001.RxCotnFlag
 	inputData["longRxFlag"] = cFYLJG001.LongRxFlag
-
-	//inputData["reptd_cnt"] = cFYLJG001.ReptdCnt
-	//inputData["mdtrtareaNo"] = cFYLJG001.MdtrtareaNo
-
 	rxdrugdetail := make([]map[string]interface{}, 0)
-
 	rxdrug := make(map[string]interface{})
 	for _, item := range cFYLJG001.List {
 		rxdrug["medListCodg"] = item.MedListCodg
@@ -67,11 +51,9 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 		rxdrug["tcmdrugTypeName"] = item.TcmdrugTypeName
 		rxdrug["tcmdrugTypeCode"] = item.TcmdrugTypeCode
 		rxdrug["tcmherbFoote"] = item.TcmherbFoote
-
 		rxdrug["mednTypeCode"] = item.MednTypeCode
 		rxdrug["mednTypeName"] = item.MednTypeName
 		rxdrug["mainMedcFlag"] = item.MainMedcFlag
-
 		rxdrug["urgtFlag"] = item.UrgtFlag
 		rxdrug["basMednFlag"] = item.BasMednFlag
 		rxdrug["impDrugFlag"] = item.ImpDrugFlag
@@ -95,18 +77,12 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 		rxdrug["drugPric"] = item.DrugPric
 		rxdrug["drugSumamt"] = item.DrugSumamt
 		rxdrug["hospApprFlag"] = item.HospApprFlag
-
 		rxdrug["selfPayRea"] = ""
 		rxdrug["realDscr"] = ""
-
-		//rxdrug["genname_codg"] = item.GennameCodg
-		//rxdrug["drug_totlcnt"] = item.DrugTotlcnt
-		//rxdrug["drug_totlcnt_emp"] = item.DrugTotlcntEmp
 		rxdrug["extras"] = ""
 		rxdrugdetail = append(rxdrugdetail, rxdrug)
 	}
 	inputData["rxdrugdetail"] = rxdrugdetail
-
 	mdtrtinfo := make(map[string]interface{})
 	mdtrtinfo["fixmedinsCode"] = cFYLJG001.Mdtrtinfo.FixmedinsCode
 	mdtrtinfo["fixmedinsName"] = cFYLJG001.Mdtrtinfo.FixmedinsName
@@ -162,9 +138,7 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 
 	mdtrtinfo["extras"] = data
 	inputData["mdtrtinfo"] = mdtrtinfo
-
 	diseinfos := make([]map[string]interface{}, 0)
-
 	for _, item := range cFYLJG001.Diseinfo {
 		diseinfo := make(map[string]interface{})
 		diseinfo["diagType"] = item.DiagType
@@ -174,7 +148,6 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 		diseinfo["diagName"] = item.DiagName
 		diseinfo["diagDept"] = item.DiagDept
 		diseinfo["diagDeptCode"] = ""
-
 		diseinfo["diagDrNo"] = item.DiagDrNo
 		diseinfo["diagDrName"] = item.DiagDrName
 		diseinfo["diagTime"] = item.DiagTime
@@ -185,30 +158,24 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 		diseinfos = append(diseinfos, diseinfo)
 	}
 	inputData["diseinfo"] = diseinfos
-
-	inputMessage["input"] = inputData
-	argInputMessage := make(map[string]interface{})
-	argInputMessage["arg0"] = inputMessage
-
 	var inputLog string
-	bytesData, err := json.Marshal(argInputMessage)
+	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+	out, err := cmd.Output()
+	fmt.Println(string(out))
 	if err != nil {
-		fmt.Println(err.Error())
+		fmt.Println("error:", err.Error())
 		return err.Error(), ""
 	}
-	reader := bytes.NewReader(bytesData)
-
-	url = url + "7101"
+	reader := bytes.NewReader(out)
+	url = url + "/fixmedins/uploadChk"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -220,48 +187,37 @@ func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insupl
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	fmt.Println(string(respBytes))
 	str := string(respBytes)
 	return str, inputLog
-
 }
 
-func GetAHCFYLJG002(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, original_value string, original_rx_file string, extras string, cainfo string) (string, string) {
+func GetAHCFYLJG002(fixmedins_code string, url string, original_value string, original_rx_file string, extras string) (string, string) {
 	// 生成签名
-	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-
 	inputData := make(map[string]interface{})
-	inputDatas := make(map[string]interface{})
-
-	inputMessage["infno"] = "7102"
 	inputData["fixmedinsCode"] = fixmedins_code
 	inputData["originalValue"] = original_value
 	inputData["originalRxFile"] = original_rx_file
 	inputData["extras"] = extras
-	inputDatas["data"] = inputData
-	inputMessage["input"] = inputDatas
-	argInputMessage := make(map[string]interface{})
-	argInputMessage["arg0"] = inputMessage
 	var inputLog string
-	bytesData, err := json.Marshal(argInputMessage)
+	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	reader := bytes.NewReader(bytesData)
-	url = url + "7102"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+	out, err := cmd.Output()
+	fmt.Println(string(out))
+	reader := bytes.NewReader(out)
+	url = url + "/fixmedins/rxFixmedinsSign"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -276,20 +232,10 @@ func GetAHCFYLJG002(org_name string, doctor string, fixmedins_code string, insup
 	fmt.Println(string(respBytes))
 	str := string(respBytes)
 	return str, inputLog
-
 }
 
-func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, cFYLJG003 models.CFYLJG003, cainfo string) (string, string) {
-	//生成签名
-	timestamp := time.Now().Unix()
-	// 生成输入报文
-	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-
+func GetAHCFYLJG003(url string, cFYLJG003 models.CFYLJG003) (string, string) {
 	inputData := make(map[string]interface{})
-	inputData2 := make(map[string]interface{})
-
-	inputMessage["infno"] = "7103"
-
 	inputData["rxTraceCode"] = cFYLJG003.RxTraceCode
 	inputData["hiRxno"] = cFYLJG003.HiRxno
 	inputData["mdtrtId"] = cFYLJG003.MdtrtID
@@ -314,19 +260,19 @@ func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insup
 	inputData["signDigest"] = cFYLJG003.SignDigest
 	inputData["extras"] = ""
 
-	//inputData["rx_frqu_name"] = cFYLJG003.RxFrquName
-	inputData2["data"] = inputData
-	inputMessage["input"] = inputData2
 	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
+	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+	out, err := cmd.Output()
+	fmt.Println(string(out))
+
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-	url = url + "7102"
+	url = url + "/fixmedins/rxFileUpld"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -352,16 +298,9 @@ func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insup
 
 }
 
-func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, cFYLJG004 models.CFYLJG004, cainfo string) (string, string) {
-	// 生成签名
-	timestamp := time.Now().Unix()
-	// 生成输入报文
-	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+func GetAHCFYLJG004(url string, cFYLJG004 models.CFYLJG004) (string, string) {
 
 	inputData := make(map[string]interface{})
-	inputData1 := make(map[string]interface{})
-	//inputDatas := make([]map[string]interface{}, 0)
-	inputMessage["infno"] = "7104"
 	inputData["hiRxno"] = cFYLJG004.HiRxno
 	inputData["fixmedinsCode"] = cFYLJG004.FixmedinsCode
 	inputData["drCode"] = cFYLJG004.UndoDrCode
@@ -370,12 +309,8 @@ func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insup
 	inputData["undoDrCertno"] = cFYLJG004.UndoDrCertno
 	inputData["undoRea"] = cFYLJG004.UndoRea
 	inputData["undoTime"] = cFYLJG004.UndoTime
-	inputData1["data"] = inputData
-	inputMessage["input"] = inputData1
-	argInputMessage := make(map[string]interface{})
-	argInputMessage["arg0"] = inputMessage
 	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
+	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -383,9 +318,7 @@ func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insup
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-
 	url = url + "CFYLJG004"
-
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {