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

controllers/sg/his_api_controller.go

@@ -527,16 +527,16 @@ type ResultTwo struct {
 		} `json:"baseinfo"`
 		Idetinfo []interface{} `json:"idetinfo"`
 		Iinfo    []struct {
-			Balc                   float64     `json:"balc"`
-			CvlservFlag            string      `json:"cvlserv_flag"`
-			EmpName                string      `json:"emp_name"`
-			InsuplcAdmdvs          string      `json:"insuplc_admdvs"`
-			Insutype               string      `json:"insutype"`
-			PausInsuDansuplcAdmdvs string      `json:"paus_insu_dansuplc_admdvs"`
-			PausInsuDate           interface{} `json:"paus_insu_date"`
-			PsnInsuDate            string      `json:"psn_insu_date"`
-			PsnInsuStas            string      `json:"psn_insu_stas"`
-			PsnType                string      `json:"psn_type"`
+			Balc                   float64 `json:"balc"`
+			CvlservFlag            string  `json:"cvlserv_flag"`
+			EmpName                string  `json:"emp_name"`
+			InsuplcAdmdvs          string  `json:"insuplc_admdvs"`
+			Insutype               string  `json:"insutype"`
+			PausInsuDansuplcAdmdvs string  `json:"paus_insu_dansuplc_admdvs"`
+			PausInsuDate           string  `json:"paus_insu_date"`
+			PsnInsuDate            string  `json:"psn_insu_date"`
+			PsnInsuStas            string  `json:"psn_insu_stas"`
+			PsnType                string  `json:"psn_type"`
 		} `json:"insuinfo"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
@@ -595,7 +595,16 @@ type ResultFour struct {
 	WarnMsg     string `json:"warn_msg"`
 }
 type ResultFive struct {
-	Insutype string `json:"insutype"`
+	Balc                   float64 `json:"balc"`
+	CvlservFlag            string  `json:"cvlserv_flag"`
+	EmpName                string  `json:"emp_name"`
+	InsuplcAdmdvs          string  `json:"insuplc_admdvs"`
+	Insutype               string  `json:"insutype"`
+	PausInsuDansuplcAdmdvs string  `json:"paus_insu_dansuplc_admdvs"`
+	PausInsuDate           string  `json:"paus_insu_date"`
+	PsnInsuDate            string  `json:"psn_insu_date"`
+	PsnInsuStas            string  `json:"psn_insu_stas"`
+	PsnType                string  `json:"psn_type"`
 }
 type ResultSix struct {
 	Cainfo      interface{} `json:"cainfo"`
@@ -976,9 +985,41 @@ func (c *HisApiController) GetRegisterInfo() {
 				IdCardNo = patient.IdCardNo
 			}
 
+			var insutypes []string
+
+			var insutype string
+			var is390 int = 0
+			var is310 int = 0
+
+			for _, item := range res.Output.Iinfo {
+				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+					insutypes = append(insutypes, item.Insutype)
+				}
+			}
+
+			if len(insutypes) == 1 {
+				insutype = insutypes[0]
+			} else {
+				for _, i := range insutypes {
+					if i == "390" {
+						is390 = 1
+					}
+
+					if i == "310" {
+						is310 = 1
+					}
+				}
+			}
+			if is390 == 1 {
+				insutype = "390"
+			}
+			if is310 == 1 {
+				insutype = "310"
+			}
+
 			if count <= 0 {
 				api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
-					res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
+					insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
 					"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
 				resp, requestErr := http.Get(api)
@@ -1021,8 +1062,13 @@ func (c *HisApiController) GetRegisterInfo() {
 						Stage:      2,
 					}
 					service.CreateErrMsgLog(errlog)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.ErrMsg,
+					})
 					return
+					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
+					//return
 				}
 
 				his.Number = res.Output.Data.MdtrtID
@@ -1079,9 +1125,13 @@ func (c *HisApiController) GetRegisterInfo() {
 							Stage:      3,
 						}
 						service.CreateErrMsgLog(errlog)
-
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"failed_code": -10,
+							"msg":         res.ErrMsg,
+						})
 						return
+						//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
+						//return
 					}
 
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -1110,8 +1160,14 @@ func (c *HisApiController) GetRegisterInfo() {
 				Stage:      1,
 			}
 			service.CreateErrMsgLog(errlog)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGdybOneException)
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
 			return
+
+			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGdybOneException)
 		}
 	} else {
 		timeStr := time.Now().Format("2006-01-02")
@@ -1402,8 +1458,39 @@ func (c *HisApiController) GetUploadInfo() {
 				mdtrt_id := his.Number
 				chrg_bchno := chrg_bchno
 				cert_no := his.Certno
-				insutype := rf[0].Insutype
 
+				var insutypes []string
+
+				var insutype string
+				var is390 int = 0
+				var is310 int = 0
+
+				for _, item := range rf {
+					if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+						insutypes = append(insutypes, item.Insutype)
+					}
+				}
+
+				if len(insutypes) == 1 {
+					insutype = insutypes[0]
+				} else {
+					for _, i := range insutypes {
+						if i == "390" {
+							is390 = 1
+						}
+
+						if i == "310" {
+							is310 = 1
+						}
+					}
+				}
+				if is390 == 1 {
+					insutype = "390"
+				}
+
+				if is310 == 1 {
+					insutype = "310"
+				}
 				if his.IdCardType == 1 {
 					cert_no = his.MedicalInsuranceNumber
 
@@ -1456,8 +1543,13 @@ func (c *HisApiController) GetUploadInfo() {
 						RecordTime: recordDateTime,
 						Stage:      6,
 					}
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.ErrMsg,
+					})
+					return
 					service.CreateErrMsgLog(errlog)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
+					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
 					return
 				} else {
 					order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
@@ -1546,8 +1638,13 @@ func (c *HisApiController) GetUploadInfo() {
 				Stage:      4,
 			}
 			service.CreateErrMsgLog(errlog)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCalOrderException)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
 			return
+			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCalOrderException)
+			//return
 		}
 
 	} else {