更新

controllers/sg/his_api_controller.go

@@ -108,7 +108,7 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/readele", &HisApiController{}, "get:ReadEleToken")
 
-	beego.Router("/api/2505", &HisApiController{}, "get:Get2505")
+	//beego.Router("/api/2505", &HisApiController{}, "get:Get2505")
 
 	beego.Router("/api/4201A", &HisApiController{}, "get:Get4201A")
 	beego.Router("/api/4202", &HisApiController{}, "get:Get4202")
@@ -176,7 +176,7 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/2406", &HisApiController{}, "get:Get2406")
 
-	beego.Router("/api/2503", &HisApiController{}, "get:Get2503")
+	//beego.Router("/api/2503", &HisApiController{}, "get:Get2503")
 
 	beego.Router("/api/1318", &HisApiController{}, "get:Get1318")
 
@@ -9120,7 +9120,7 @@ func (c *HisApiController) Get3103() {
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	result, requestLog := service.Gdyb3103(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, warm_type, warm_ids, fk_state, desc)
 	saveLog(result, requestLog, "3103", "反馈")
-	var res2 ResultSix
+	var res2 ResultSix3103
 	var respJSON2 map[string]interface{}
 	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -9148,13 +9148,7 @@ func (c *HisApiController) Get3103() {
 	}
 }
 
-func (c *HisApiController) Get3103() {
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(10375)
-	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 
-	service.Gdyb2505("45000000000008100145868008", curRoles.UserName, miConfig.OrgName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "2024-01-12 09:00:00", "2026-12-31 23:00:00", admin_user_id)
-}
 
 func (c *HisApiController) Get4201A() {
 	order_id, _ := c.GetInt64("order_id")
@@ -23807,6 +23801,18 @@ type ResultSix struct {
 	WarnMsg     interface{} `json:"warn_msg"`
 }
 
+type ResultSix3103 struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type FJ3507Result struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
@@ -27005,7 +27011,7 @@ func (c *HisApiController) GetRegisterInfo() {
 										"failed_code": -10,
 										"failed_type": 100,
 										"warm_type":   1,
-										"msg":         res3101.Output.Result,
+										"msg":         res3101,
 									})
 									return
 								} else {
@@ -30561,7 +30567,7 @@ func (c *HisApiController) GetUploadInfo() {
 									"failed_code": -10,
 									"failed_type": 100,
 									"warm_type":   2,
-									"msg":         result3101.Output.Result,
+									"msg":         result3101,
 								})
 								return
 							}
@@ -32515,7 +32521,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 										"failed_code": -10,
 										"failed_type": 100,
 										"warm_type":   1,
-										"msg":         result3101.Output.Result,
+										"msg":         result3101,
 									})
 									return
 								} else {
@@ -33926,7 +33932,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 											"failed_code": -10,
 											"failed_type": 100,
 											"warm_type":   2,
-											"msg":         result3101.Output.Result,
+											"msg":         result3101,
 										})
 										return
 									} else {

service/hn_service.go

@@ -411,16 +411,17 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//timestamp := time.Now().Unix()
 	//timestamp := time.Now().Unix()
 
-	timestamp2 := time.Now().Unix()
+	//timestamp2 := time.Now().Unix()
+
 
-	tempTime := time.Unix(timestamp2, 0)
-	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	var customs []*Custom
 	for _, item := range hisPrescription {
 		//tm := time.Unix(item.PreTime, 0)
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
+				tempTime := time.Unix(subItem.StartTime, 0)
+				timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
@@ -449,6 +450,8 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
+				tempTime := time.Unix(subItem.StartTime, 0)
+				timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 				//var randNum int
 				//randNum = rand.Intn(10000) + 1000
 				if subItem.Type == 2 {
@@ -471,6 +474,8 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					}
 
 				} else if subItem.Type == 3 {
+					tempTime := time.Unix(subItem.StartTime, 0)
+					timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
 						cnt, _ := strconv.ParseFloat(subItem.Count, 64)