更新

controllers/sg/his_api_controller.go

@@ -34,6 +34,8 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
+
 )
 
 type HisApiController struct {
@@ -204,7 +206,11 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/35082", &HisApiController{}, "get:Get35082")
 
 	beego.Router("/api/changedrug/four", &HisApiController{}, "get:ChangeDrugfour")
+	beego.Router("/api/changedrug/five", &HisApiController{}, "get:ChangeDrugFive")
+
 	beego.Router("/api/delete_xs_bg_two", &HisApiController{}, "get:DeleteXSandBGTwo")
+	beego.Router("/api/delete_xs_bg_two", &HisApiController{}, "get:DeleteXSandBGTwo")
+
 	beego.Router("/api/3201", &HisApiController{}, "get:Get3201")
 
 }
@@ -224,9 +230,11 @@ func (c *HisApiController) Get3201() {
 }
 
 func (c *HisApiController) TestNet() {
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "成功",
-	})
+	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	return
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"msg": "成功",
+	//})
 }
 
 func (c *HisApiController) Get3508() {
@@ -2727,10 +2735,11 @@ func (c *HisApiController) DeleteXSandBGTwo() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
+
 	advicelist, _ := service.FindUploadHisAdviceDocAdvice(c.GetAdminUserInfo().CurrentOrgId, patient_id, stime, etime)
 	var flows []*models.DrugFlow
 	for _, item := range advicelist {
-		flow, _ := service.GetNewUploadDrugFlowInfoByPatientTwo(patient_id, item.ID, times, c.GetAdminUserInfo().CurrentOrgId)
+		flow, _ := service.GetNewUploadDrugFlowInfoByPatientTwo(patient_id, item.DrugId, stime, c.GetAdminUserInfo().CurrentOrgId)
 		flows = append(flows, flow...)
 	}
 
@@ -2742,7 +2751,6 @@ func (c *HisApiController) DeleteXSandBGTwo() {
 	for _, item := range flows {
 		if item.IsSale == 1 {
 			var res FJ3507Result
-			var res2 FJ3507Result
 
 			var struct3507 models.Struct3507
 			struct3507.FixmedinsBchno = item.Bchno
@@ -2914,98 +2922,11 @@ func (c *HisApiController) DeleteXSandBGTwo() {
 			}
 
 			if res.Infcode == 0 {
+				service.SaveDoctoradviceStatusTwo(item.HisDoctorAdviceInfo.ID)
 				item.IsSale = 0
 				item.SaleDate = ""
 				item.Bchno = ""
-
-				err2 := service.SaveDF(item)
-				if err2 == nil {
-					var struct3507_2 models.Struct3507
-					struct3507_2.OrgName = miConfig.OrgName
-					struct3507_2.AccessKey = miConfig.AccessKey
-					struct3507_2.RequestUrl = miConfig.Url
-					struct3507_2.Opter = roles.UserName
-					struct3507_2.FixmedinsCode = miConfig.Code
-					struct3507_2.Code = miConfig.Code
-
-					struct3507_2.SecretKey = miConfig.SecretKey
-					struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-					struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-					struct3507_2.Url = miConfig.Url
-					struct3507_2.AppId = miConfig.Cainfo
-					struct3507_2.AppSecret = miConfig.AppSecret
-					struct3507_2.Enckey = miConfig.EncKey
-					struct3507_2.SignKey = miConfig.SignKey
-					struct3507_2.SecretKey = miConfig.SecretKey
-					struct3507_2.FixmedinsBchno = item.BgBchno
-					struct3507_2.InvDataType = "2"
-
-					if miConfig.MdtrtareaAdmvs == "350500" {
-						result11, result22, _ := service.FJyb3507(struct3507_2)
-						saveLog(result11, result22, "3507", "3507")
-
-						var respJSON3 map[string]interface{}
-						if err := json.Unmarshal([]byte(string(result11)), &respJSON3); err != nil {
-							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-						userJSONBytes3, _ := json.Marshal(respJSON3)
-						if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-					} else {
-
-						data := make(map[string]interface{})
-						data["struct_3507s"] = struct3507_2
-						client := &http.Client{}
-						bytesData, _ := json.Marshal(data)
-						var req *http.Request
-						if miConfig.MdtrtareaAdmvs == "320921" {
-							req, _ = http.NewRequest("POST", "http://192.168.2.3:9532/"+"jsyb/3507", bytes.NewReader(bytesData))
-						} else {
-							req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3507", bytes.NewReader(bytesData))
-						}
-
-						resp, _ := client.Do(req)
-						defer resp.Body.Close()
-						body, ioErr := ioutil.ReadAll(resp.Body)
-						if ioErr != nil {
-							utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-						}
-						var respJSON map[string]interface{}
-						if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-						var resSix10265 ResultSix10265 //1101结果
-						respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-						result, _ := json.Marshal(respJSON)
-						if err := json.Unmarshal([]byte(result), &resSix10265); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
-						}
-						res2.InfRefmsgid = resSix10265.InfRefmsgid
-						//res.Output = resSix10265.Output
-						res2.ErrMsg = resSix10265.ErrMsg
-						res2.Cainfo = resSix10265.Cainfo
-						res2.WarnMsg = resSix10265.WarnMsg
-						infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
-						res2.Infcode = infocode
-					}
-
-					if res2.Infcode == 0 {
-						item.IsChange = 0
-						item.BgBchno = ""
-						service.SaveDF2(item)
-					} else {
-						err = append(err, "删除"+item.HisDoctorAdviceInfo.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
-					}
-				}
+				service.SaveDF(item)
 			} else {
 				err = append(err, "删除"+item.HisDoctorAdviceInfo.BaseDrugLib.DrugName+"盘存失败,失败原因："+res.ErrMsg)
 			}
@@ -3043,7 +2964,7 @@ func (c *HisApiController) ChangeDrugfour() {
 	advicelist, _ := service.FindeHisAdviceDocAdvice(c.GetAdminUserInfo().CurrentOrgId, patient_id, stime, etime)
 	var flows []*models.DrugFlow
 	for _, item := range advicelist {
-		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.ID, stime, c.GetAdminUserInfo().CurrentOrgId)
+		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.DrugId, stime, c.GetAdminUserInfo().CurrentOrgId)
 		flows = append(flows, flow...)
 	}
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -3090,6 +3011,7 @@ func (c *HisApiController) ChangeDrugfour() {
 						}
 					}
 					if res.Infcode == 0 {
+						service.SaveDoctoradviceStatus(item.HisDoctorAdviceInfo.ID)
 						item.IsSale = 1
 						item.Bchno = number
 						item.SaleDate = time.Now().Format("2006-01-02")
@@ -5252,6 +5174,11 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		struct3505.PharName = "彭斯遥"
 		struct3505.PharPracCertNo = "30220200943042010052"
 	}
+
+	if org_id == 9504 {
+		struct3505.PharName = "资美红"
+		struct3505.PharPracCertNo = "D440904006635"
+	}
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
@@ -5262,10 +5189,20 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 
 	if drug.HisDoctorAdviceInfo.PrescribingNumberUnit != drug.HisDoctorAdviceInfo.BaseDrugLib.MinUnit {
 		struct3505.TrdnFlag = "0"
+
 	} else {
 		struct3505.TrdnFlag = "1"
 	}
 
+	if drug.HisDoctorAdviceInfo.ZeroFlag == 1{
+		struct3505.TrdnFlag = "1"
+	}
+
+	if drug.HisDoctorAdviceInfo.ZeroFlag == 2{
+		struct3505.TrdnFlag = "0"
+
+	}
+
 	struct3505.RtalDocno = order.Number
 	struct3505.PsnCertType = "01"
 
@@ -33489,6 +33426,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 						} else {
 							var result string
 							var request_log string
+							var dat map[string]interface{}
+
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							allTotal = fmt.Sprintf("%.2f", total_two)
 							if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" {
@@ -33518,7 +33457,6 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 										}
 
-										var dat map[string]interface{}
 										if err := json.Unmarshal([]byte(result), &dat); err == nil {
 											fmt.Println(dat)
 										} else {
@@ -33541,15 +33479,15 @@ func (c *HisApiController) GetPreUploadInfo() {
 									result, request_log = service.Gdyb2206(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, 0, 0, 0, 0, his.IdType, admin_user_id)
 
 								}
+								if err := json.Unmarshal([]byte(result), &dat); err == nil {
+									fmt.Println(dat)
+								} else {
+									fmt.Println(err)
+								}
+								saveLog(result, request_log, "2206", "预结算")
 							}
 
-							var dat map[string]interface{}
-							if err := json.Unmarshal([]byte(result), &dat); err == nil {
-								fmt.Println(dat)
-							} else {
-								fmt.Println(err)
-							}
-							saveLog(result, request_log, "2206", "预结算")
+
 							//userJSONBytes, _ := json.Marshal(dat)
 							//
 							//if err := json.Unmarshal(userJSONBytes, &res); err != nil {

models/his_models.go

@@ -239,6 +239,9 @@ type HisDoctorAdviceInfo struct {
 
 	NewGroupno string `gorm:"column:-" json:"new_groupno" form:"new_groupno"`
 	Newfn      string `gorm:"column:-" json:"newfn" form:"newfn"`
+	IsUpload           int64 `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	ZeroFlag           int64 `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
+
 
 	BaseDrugLib BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }

service/gdyb_service.go

@@ -217,16 +217,7 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101A", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out)
-	} else {
+ {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -316,17 +307,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 		url = gdyb_url + "2201"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+	  {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -432,17 +413,7 @@ func Gdyb2201A(psnNo string, insutype string, certNo string, org_name string, op
 		url = gdyb_url + "2201"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+	  {
 		fmt.Println(url)
 		fmt.Println(gdyb_paasid)
 		fmt.Println(secret_key)
@@ -534,17 +505,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2202", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+	{
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -666,17 +627,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		url = gdyb_url + "2203"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+	{
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -783,18 +734,7 @@ func Gdyb2203c(psnNo string, mdtrtId string, doctor string, department string, o
 	} else {
 		url = gdyb_url + "2203"
 	}
-
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+ {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -903,17 +843,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		url = gdyb_url + "2203"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203A", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+ {
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -1012,18 +942,7 @@ func Gdyb2203d(psnNo string, mdtrtId string, doctor string, department string, o
 	var url string
 
 	url = gdyb_url + "2203"
-
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203A", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+{
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -1323,17 +1242,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2204", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+ {
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -1555,17 +1464,7 @@ func Gdyb2204For441799(psnNo string, mdtrtId string, hisPrescription []*models.H
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2204", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+	{
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -1652,18 +1551,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
-
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2205", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+{
 		request, err := http.NewRequest("POST", url, reader)
 		fmt.Println(err)
 
@@ -1738,13 +1626,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
-	if insuplc_admdvs == "421300" {
-		if med_type == "11" || med_type == "1112" || med_type == "1111" {
-			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
-		} else if med_type == "14" {
-			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
-		}
-	} else {
+	 {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
 
@@ -1789,17 +1671,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2206"
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2206", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), requestLog
-	} else {
+	 {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -1871,13 +1743,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	if med_type == "1111" || med_type == "1112" {
 		med_type = "11"
 	}
-	if insuplc_admdvs == "421300" {
-		if med_type == "11" {
-			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
-		} else if med_type == "14" {
-			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
-		}
-	} else {
+ {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
 	inputData["medfee_sumamt"] = total           // 医疗费总额
@@ -1920,20 +1786,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
-
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2207", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		mjson, _ := json.Marshal(inputMessage)
-		str2 := string(mjson)
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), str2
-	} else {
+ {
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -1996,13 +1849,7 @@ func Gdyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, in
 	if med_type == "1111" || med_type == "1112" {
 		med_type = "11"
 	}
-	if insuplc_admdvs == "421300" {
-		if med_type == "11" {
-			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
-		} else if med_type == "14" {
-			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
-		}
-	} else {
+	{
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
 	inputData["medfee_sumamt"] = total           // 医疗费总额
@@ -2046,19 +1893,7 @@ func Gdyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, in
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2207", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		mjson, _ := json.Marshal(inputMessage)
-		str2 := string(mjson)
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), str2
-	} else {
+ {
 
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
@@ -2147,19 +1982,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		mjson, _ := json.Marshal(inputMessage)
-		str2 := string(mjson)
-		fmt.Println(string(out))
-
-		return hex.EncodeToString(out), str2
-	} else {
+	 {
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -5972,17 +5795,7 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	} else {
 		url = gdyb_url + "3260"
 	}
-
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog
-	} else {
+ {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 		request, err := http.NewRequest("POST", url, reader)
@@ -6424,16 +6237,7 @@ func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		url = gdyb_url + "3262"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog
-	} else {
+	 {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 		request, err := http.NewRequest("POST", url, reader)
@@ -6525,16 +6329,7 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		url = gdyb_url + "9001"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog
-	} else {
+ {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 
@@ -6619,16 +6414,7 @@ func Gdyb9001Two(org_name string, doctor string, fixmedins_code string, insuplc_
 		url = gdyb_url + "9001"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog
-	} else {
+	 {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 
@@ -6792,16 +6578,7 @@ func Gdyb1101D(certNo string, org_name string, doctor string, fixmedins_code str
 		url = gdyb_url + "1101"
 	}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog
-	} else {
+ {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 		request, err := http.NewRequest("POST", url, reader)
@@ -7438,7 +7215,7 @@ func Gdyb3507(struct3507 models.Struct3507, secret_key string) (string, string)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3507"                          // 交易编码
-	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsBchno // 人员编号 （来自1101接口返回）
 	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData

service/his_service.go

@@ -1757,14 +1757,14 @@ func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow
 }
 
 func GetNewDrugFlowInfoByPatient(patient_id int64, drug_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and drug_id = ? and system_time = ?", org_id, patient_id, drug_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1  and patient_id = ? and drug_id = ? and system_time = ?", org_id, patient_id, drug_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }
 
 func GetNewUploadDrugFlowInfoByPatientTwo(patient_id int64, advice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and advice_id = ? and system_time = ? and is_sale = 1 and is_bg = 1", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1  and patient_id = ? and drug_id = ? and system_time = ? and is_sale = 1", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
@@ -1907,6 +1907,8 @@ type HisDoctorAdviceInfo struct {
 	IsMedicine           int64 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	ExecutionFrequencyId int64 `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	IsSelfDrug           int64 `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	IsUpload           int64 `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+
 }
 
 type Drug struct {
@@ -2129,7 +2131,7 @@ func (HisPrescriptionProject) TableName() string {
 
 func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
-	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0 and drug_code <> ''")
+	db := XTReadDB().Model(&advice).Where("status= 1  and drug_code <> ''")
 
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
@@ -2150,7 +2152,7 @@ func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime i
 
 func FindUploadHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
-	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
+	db := XTReadDB().Model(&advice).Where("status= 1")
 
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
@@ -2168,3 +2170,14 @@ func FindUploadHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, et
 	err = db.Find(&advice).Error
 	return advice, err
 }
+
+func SaveDoctoradviceStatus(id int64){
+	 writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 1})
+
+}
+
+
+func SaveDoctoradviceStatusTwo(id int64){
+	writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 0})
+
+}