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

controllers/coordinate/coordinate_controller.go

@@ -11,6 +11,12 @@ type CoordinateController struct {
 	controllers.BaseAuthAPIController
 }
 
+type ResultReg struct {
+	ResultCode string `json:"resultCode"`
+	ResultDesc string `json:"resultDesc"`
+	InfoSeq    int64  `json:"infoSeq"`
+}
+
 func CoordinateRegistRouters() {
 	beego.Router("/coordinate/check", &CoordinateController{}, "get:SavePatientMessageInfo")
 	beego.Router("/coordinate/register", &CoordinateController{}, "get:Register")
@@ -21,16 +27,19 @@ func CoordinateRegistRouters() {
 }
 
 func (c *CoordinateController) SavePatientMessageInfo() {
-	result, request_log := service.SavePatientMessageInfo()
-	fmt.Println(result)
-	fmt.Println(request_log)
+	//result, request_log := service.SavePatientMessageInfo()
 
 }
 
 func (c *CoordinateController) Register() {
-	result, request_log := service.SaveReg()
-	fmt.Println(result)
-	fmt.Println(request_log)
+	//var reg models.Reg
+	//reg.
+	//
+	//
+	//
+	//result, request_log := service.SaveReg()
+	//fmt.Println(result)
+	//fmt.Println(request_log)
 
 }
 

controllers/zh/zh_his_api_controller.go

@@ -2256,9 +2256,10 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
-	result, requestLog := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
-	//saveLog()
-	saveLog(result, requestLog, "2404", "入院登记撤销")
+
+	result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+	//saveLog(result,requestLog,)
+	saveLog(result, requestLog, "2302", "月结退明细")
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -2266,8 +2267,10 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 	} else {
 		fmt.Println(err)
 	}
+
 	userJSONBytes, _ := json.Marshal(dat)
-	var res ResultEmpty
+
+	var res2 ResultEmpty
 	var resEmpty10265 ResultEmpty10265
 	if miConfig.Code == "H15049901371" {
 		if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
@@ -2276,31 +2279,73 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 			return
 		}
 		Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
-		res.Infcode = Infcode
-		res.RespondTime = resEmpty10265.RespondTime
-		res.ErrMsg = resEmpty10265.ErrMsg
-		res.Output = resEmpty10265.Output
-		res.WarnMsg = resEmpty10265.WarnMsg
+		res2.Infcode = Infcode
+		res2.RespondTime = resEmpty10265.RespondTime
+		res2.ErrMsg = resEmpty10265.ErrMsg
+		res2.Output = resEmpty10265.Output
+		res2.WarnMsg = resEmpty10265.WarnMsg
 	} else {
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
 	}
 
-	if res.Infcode == 0 {
-		record.Status = 0
-		service.CreateHospitalRecord(&record)
+	if res2.Infcode == 0 {
 
-		this.ServeSuccessJSON(map[string]interface{}{
-			"msg": "撤销入院成功",
-		})
+		result, requestLog := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		//saveLog()
+		saveLog(result, requestLog, "2404", "入院登记撤销")
+
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultEmpty
+		var resEmpty10265 ResultEmpty10265
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+			res.Infcode = Infcode
+			res.RespondTime = resEmpty10265.RespondTime
+			res.ErrMsg = resEmpty10265.ErrMsg
+			res.Output = resEmpty10265.Output
+			res.WarnMsg = resEmpty10265.WarnMsg
+		} else {
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		}
+
+		if res.Infcode == 0 {
+			record.Status = 0
+			service.CreateHospitalRecord(&record)
+
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "撤销入院成功",
+			})
+
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+		}
 
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"failed_code": -10,
-			"msg":         res.ErrMsg,
+			"code": -10,
+			"msg":  res2.ErrMsg,
 		})
 	}
 

models/zb_his_models.go

@@ -0,0 +1,12 @@
+package models
+
+type Reg struct {
+	DeptId      string
+	PatientId   string
+	PatientName string
+	DoctorId    string
+	RegDate     string
+	RegFee      string
+	TreatFee    string
+	OperatorId  string
+}

service/coordinate_service.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"gdyb/models"
 	"io/ioutil"
 	"net/http"
 )
@@ -12,7 +13,6 @@ func SavePatientMessageInfo() (string, string) {
 
 	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-
 	inputData["patType"] = "1"                  // 就诊凭证编号
 	inputData["patIdNo"] = "441701195808152845" // 开始时间
 	inputData["patName"] = "罗秀云"                // 人员姓名
@@ -65,22 +65,23 @@ func SavePatientMessageInfo() (string, string) {
 	return str, inputLog
 
 }
-func SaveReg() (string, string) {
+
+func SaveReg(reg models.Reg) (string, string) {
 
 	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 
-	inputData["deptId"] = "01"     // 就诊凭证编号
-	inputData["clinicUnitId"] = "" // 开始时间
-	inputData["healthCardNo"] = "" // 人员姓名
+	inputData["deptId"] = reg.DeptId // 就诊凭证编号
+	inputData["clinicUnitId"] = ""   // 开始时间
+	inputData["healthCardNo"] = ""   // 人员姓名
 
-	inputData["patientId"] = "701822660170096645" // 人员姓名
-	inputData["patientName"] = "罗秀云"              // 人员姓名
-	inputData["idCardNo"] = ""                    // 人员姓名
-	inputData["phone"] = ""                       // 人员姓名
-	inputData["doctorId"] = "01"                  // 人员姓名
-	inputData["doctorLevelCode"] = ""             // 人员姓名
-	inputData["regDate"] = "2022-05-10"           // 人员姓名
+	inputData["patientId"] = reg.PatientId     // 人员姓名
+	inputData["patientName"] = reg.PatientName // 人员姓名
+	inputData["idCardNo"] = ""                 // 人员姓名
+	inputData["phone"] = ""                    // 人员姓名
+	inputData["doctorId"] = reg.DoctorId       // 人员姓名
+	inputData["doctorLevelCode"] = ""          // 人员姓名
+	inputData["regDate"] = reg.RegDate         // 人员姓名
 
 	inputData["shiftCode"] = "" // 人员姓名
 	inputData["startTime"] = "" // 人员姓名
@@ -89,13 +90,13 @@ func SaveReg() (string, string) {
 	inputData["scheduleId"] = "" // 人员姓名
 	inputData["periodId"] = ""   // 人员姓名
 
-	inputData["svObjectId"] = "" // 人员姓名
-	inputData["diseaseId"] = ""  // 人员姓名
-	inputData["regFee"] = "0.00" // 人员姓名
+	inputData["svObjectId"] = ""     // 人员姓名
+	inputData["diseaseId"] = ""      // 人员姓名
+	inputData["regFee"] = reg.RegFee // 人员姓名
 
-	inputData["treatFee"] = "0.00"    // 人员姓名
-	inputData["operatorId"] = "admin" // 人员姓名
-	inputData["remark"] = ""          // 人员姓名
+	inputData["treatFee"] = reg.TreatFee     // 人员姓名
+	inputData["operatorId"] = reg.OperatorId // 人员姓名
+	inputData["remark"] = ""                 // 人员姓名
 
 	inputData["orderType"] = ""  // 人员姓名
 	inputData["clinicCode"] = "" // 人员姓名