更新

controllers/sg/his_api_controller.go

@@ -34,6 +34,8 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
+
 )
 
 type HisApiController struct {
@@ -8004,7 +8006,6 @@ func (c *HisApiController) GetCFYLJG001() {
 	patient_id, _ := c.GetInt64("patient_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	record_time := c.GetString("record_time")
-	admin_user_id = 3626
 	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
 	psn, _ := service.GetPsnByPatientId(patient_id)
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -8067,9 +8068,9 @@ func (c *HisApiController) GetCFYLJG001() {
 			}
 		}
 		cFYLJG001.RxDrugCnt = count
-		cFYLJG001.ValiDays = "5"
+		cFYLJG001.ValiDays = "2"
 		ts := time.Unix(item.PreTime, 0)
-		record_time2 := ts.AddDate(0, 0, int(5)).Unix()
+		record_time2 := ts.AddDate(0, 0, int(2)).Unix()
 		tempTime3 := time.Unix(record_time2, 0)
 		timeFormat3 := tempTime3.Format("2006-01-02 15:04:05")
 		cFYLJG001.ValiEndTime = timeFormat3
@@ -8147,10 +8148,10 @@ func (c *HisApiController) GetCFYLJG001() {
 		tempTime6 := time.Unix(tempTime2, 0)
 		timeFormatTwo := tempTime6.Format("2006-01-02 15:04:05")
 		cFYLJG001.Mdtrtinfo.MdtrtTime = timeFormatTwo
-		cFYLJG001.Mdtrtinfo.DiseCodg = "M07803"
+		cFYLJG001.Mdtrtinfo.DiseCodg = ""
 		cFYLJG001.Mdtrtinfo.SpDiseFlag = "1"
-		cFYLJG001.Mdtrtinfo.MaindiagCode = "N18.500"
-		cFYLJG001.Mdtrtinfo.MaindiagName = "慢性肾脏病5期"
+		cFYLJG001.Mdtrtinfo.MaindiagCode = "I10.x00x002"
+		cFYLJG001.Mdtrtinfo.MaindiagName = "高血压"
 
 		diagnosis_ids := strings.Split(info.Diagnosis, ",")
 		var config []*models.HisXtDiagnoseConfig
@@ -8193,7 +8194,7 @@ func (c *HisApiController) GetCFYLJG001() {
 		if miConfig.MdtrtareaAdmvs == "340699" {
 			result, request := service.GetAHCFYLJG001("http://10.66.149.64:8080/epc/api", cFYLJG001, his.Insutype)
 			saveLog(result, request, "GetCFYLJG001", "GetCFYLJG001")
-			var res ResultCFYLJG001
+			var res ResultCFYLJG001AH
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -8206,19 +8207,12 @@ func (c *HisApiController) GetCFYLJG001() {
 				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.RxTraceCode = res.RxTraceCode
+				flow.HiRxno = res.HiRxno
 				flow.MID = his.Number
 				flow.Status = 1
 				flow.DCode = doctor_info.DoctorNumber
@@ -8233,7 +8227,7 @@ func (c *HisApiController) GetCFYLJG001() {
 				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)
@@ -25398,6 +25392,12 @@ type ResultCFYLJG001 struct {
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
+type ResultCFYLJG001AH struct {
+		RxTraceCode string `json:"rxTraceCode"`
+		HiRxno      string `json:"hiRxno"`
+
+}
+
 type ResultCFYLJG007 struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
@@ -32231,6 +32231,11 @@ func (c *HisApiController) GetPreUploadInfo() {
 				data["sick_code"] = sickConfig.CountryCode
 				data["sick_name"] = sickConfig.ClassName
 			}
+			if reg_type == 11 {
+				med_type = "11"
+				data["sick_code"] = sickConfig.CountryCode
+				data["sick_name"] = sickConfig.ClassName
+			}
 		} else if his.Insutype == "310" {
 			if reg_type == 992102 {
 				med_type = "992102"
@@ -32253,6 +32258,12 @@ func (c *HisApiController) GetPreUploadInfo() {
 				data["sick_code"] = sickConfig.CountryCode
 				data["sick_name"] = sickConfig.ClassName
 			}
+
+			if reg_type == 11 {
+				med_type = "11"
+				data["sick_code"] = sickConfig.CountryCode
+				data["sick_name"] = sickConfig.ClassName
+			}
 		}
 
 		data["med_type"] = med_type

service/ah_dianzichufang.go

@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os/exec"
+	"strings"
 )
 
 func GetAHCFYLJG001(url string, cFYLJG001 models.CFYLJG001, isu string) (string, string) {
@@ -161,16 +162,21 @@ func GetAHCFYLJG001(url string, cFYLJG001 models.CFYLJG001, isu string) (string,
 	var inputLog string
 	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+	fmt.Println(inputLog)
+
+	cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", "encrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+
 	out, err := cmd.Output()
-	fmt.Println(string(out))
-	if err != nil {
-		fmt.Println("error:", err.Error())
-		return err.Error(), ""
-	}
-	reader := bytes.NewReader(out)
+
+	aa := strings.Split(string(out),"======")
+	fmt.Println(aa[1])
+
+	reader := bytes.NewReader([]byte(aa[1]))
 	url = url + "/fixmedins/uploadChk"
+	fmt.Println(url)
+
 	request, err := http.NewRequest("POST", url, reader)
+
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
@@ -178,17 +184,41 @@ func GetAHCFYLJG001(url string, cFYLJG001 models.CFYLJG001, isu string) (string,
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
 	client := http.Client{}
 	resp, err := client.Do(request)
+
+
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
+
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
 	str := string(respBytes)
-	return str, inputLog
+
+	var data2 map[string]interface{}
+
+	// 解析 JSON 字符串到 map
+	 json.Unmarshal([]byte(str), &data2)
+
+	// 检查 code 字段是否存在，并将其转换为字符串
+	if val, ok := data2["code"]; ok {
+		data2["code"] = fmt.Sprintf("%v", val) // 将 code 转换为字符串
+	}
+
+	// 将处理后的数据重新转换为 JSON 字符串
+	updatedJSON2, _ := json.Marshal(data2)
+
+
+	fmt.Println(string(updatedJSON2))
+	cmd2 := exec.Command("java", "-jar", "encrypt-utils-all.jar", "decrypt", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "BDoCErhDkP7KEG/BqNpjKIG5a3CapA8wbhXMNemzu+/fQD2kiW9rIDVLHxOEpAwnCuftjdZqf4Bz3x2gFShyk/8=", string(updatedJSON2))
+	out2, _ := cmd2.Output()
+	fmt.Println(string(out2))
+	bb := strings.Split(string(out2),"======")
+	fmt.Println(bb[1])
+	return bb[1], inputLog
 }
 
 func GetAHCFYLJG002(fixmedins_code string, url string, original_value string, original_rx_file string, extras string) (string, string) {
@@ -207,7 +237,7 @@ func GetAHCFYLJG002(fixmedins_code string, url string, original_value string, or
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+	cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", "encrypt",  "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
 	out, err := cmd.Output()
 	fmt.Println(string(out))
 	reader := bytes.NewReader(out)
@@ -263,15 +293,15 @@ func GetAHCFYLJG003(url string, cFYLJG003 models.CFYLJG003) (string, string) {
 	var inputLog string
 	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
+	cmd := exec.Command("java", "-jar", "encrypt-utils-all.jar", "encrypt",  "19D43125C3E64BB784601F7B19A8D785", "6014F1F2CA6247F8960AF61A306B5DCC", "Ns0K7Gsxk1WSfxYYyBcCL3J4Q/2Tvp1bMe8JbakA9Fg=", inputLog)
 	out, err := cmd.Output()
 	fmt.Println(string(out))
-
+	aa := strings.Split(string(out),"======")
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	reader := bytes.NewReader(bytesData)
+	reader := bytes.NewReader([]byte(aa[1]))
 	url = url + "/fixmedins/rxFileUpld"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)

service/his_service.go

@@ -1679,7 +1679,7 @@ func GetHisPrescriptionForMedType(org_id int64, patient_id int64, record_date in
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("(user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 and med_type = 148801) or (user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 and med_type = 118801)", org_id, record_date, patient_id, org_id, record_date, patient_id).
+		Where("(user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 ) or (user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 )", org_id, record_date, patient_id, org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }