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

controllers/sg/his_api_controller.go

@@ -2741,206 +2741,202 @@ func (c *HisApiController) GetUploadInfo() {
 		}
 
 	} else if tempOrder.ID > 0 {
-		if tempOrder.IsPre == 1 {
 
-			allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
-			var rf []*ResultFive
-			json.Unmarshal([]byte(his.Iinfo), &rf)
-			chrg_bchno := tempOrder.Number
-			cert_no := his.Certno
+		allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
+		var rf []*ResultFive
+		json.Unmarshal([]byte(his.Iinfo), &rf)
+		chrg_bchno := tempOrder.Number
+		cert_no := his.Certno
 
-			var insutypes []string
+		var insutypes []string
 
-			var insutype string
-			var is390 int = 0
-			var is310 int = 0
+		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)
-				}
+		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 len(insutypes) == 1 {
+			insutype = insutypes[0]
+		} else {
+			for _, i := range insutypes {
+				if i == "390" {
+					is390 = 1
+				}
 
-					if i == "310" {
-						is310 = 1
-					}
+				if i == "310" {
+					is310 = 1
 				}
 			}
-			if is390 == 1 {
-				insutype = "390"
-			}
+		}
+		if is390 == 1 {
+			insutype = "390"
+		}
 
-			if is310 == 1 {
-				insutype = "310"
-			}
+		if is310 == 1 {
+			insutype = "310"
+		}
 
-			if len(insutypes) == 0 {
-				insutype = "310"
-			}
+		if len(insutypes) == 0 {
+			insutype = "310"
+		}
 
-			//insutype = "390"
-			if his.IdCardType == 1 {
-				// cert_no = his.MedicalInsuranceNumber
-				cert_no = his.Certno
+		//insutype = "390"
+		if his.IdCardType == 1 {
+			// cert_no = his.MedicalInsuranceNumber
+			cert_no = his.Certno
 
-			} else {
+		} else {
 
-				cert_no = his.Certno
+			cert_no = his.Certno
 
-			}
-			var res ResultSeven
-			var src_resquest string
-			var result2 string
+		}
+		var res ResultSeven
+		var src_resquest string
+		var result2 string
 
-			if miConfig.MdtrtareaAdmvs == "421300" {
-				api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-					"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10)
+		if miConfig.MdtrtareaAdmvs == "421300" {
+			api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+				his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+				"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+				"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+				"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+				"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10)
 
-				resp, requestErr := http.Get(api)
-				if requestErr != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-				body, ioErr := ioutil.ReadAll(resp.Body)
-				if ioErr != nil {
-					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-				var respJSON map[string]interface{}
-				if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-				result, _ := json.Marshal(respJSON)
-				fmt.Println("log")
-				fmt.Println(string(result))
-				if err := json.Unmarshal([]byte(result), &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+			fmt.Println("log")
+			fmt.Println(string(result))
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+		} else {
 
+			result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+				fmt.Println(dat)
 			} else {
+				fmt.Println(err)
+			}
 
-				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType)
-				var dat map[string]interface{}
-				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
-					fmt.Println(dat)
-				} else {
-					fmt.Println(err)
-				}
+			saveLog(result2, src_resquest, "2207", "结算")
 
-				saveLog(result2, src_resquest, "2207", "结算")
+			userJSONBytes, _ := json.Marshal(dat)
 
-				userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+		}
 
+		if res.Infcode != 0 {
+			errlog := &models.HisOrderError{
+				UserOrgId:  adminUser.CurrentOrgId,
+				Ctime:      time.Now().Unix(),
+				Mtime:      time.Now().Unix(),
+				Number:     chrg_bchno,
+				ErrMsg:     res.ErrMsg,
+				Status:     1,
+				PatientId:  id,
+				RecordTime: recordDateTime,
+				Stage:      6,
 			}
-
-			if res.Infcode != 0 {
-				errlog := &models.HisOrderError{
-					UserOrgId:  adminUser.CurrentOrgId,
-					Ctime:      time.Now().Unix(),
-					Mtime:      time.Now().Unix(),
-					Number:     chrg_bchno,
-					ErrMsg:     res.ErrMsg,
-					Status:     1,
-					PatientId:  id,
-					RecordTime: recordDateTime,
-					Stage:      6,
-				}
-				service.CreateErrMsgLog(errlog)
+			service.CreateErrMsgLog(errlog)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		} else {
+			order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+			order.OrderStatus = 2
+			order.MdtrtId = res.Output.Setlinfo.MdtrtID
+			order.SetlId = res.Output.Setlinfo.SetlID
+			order.PsnNo = res.Output.Setlinfo.PsnNo
+			order.PsnName = res.Output.Setlinfo.PsnName
+			order.PsnCertType = res.Output.Setlinfo.PsnCertType
+			order.Certno = res.Output.Setlinfo.Certno
+			order.Gend = res.Output.Setlinfo.Gend
+			order.Naty = res.Output.Setlinfo.Naty
+			order.Age = res.Output.Setlinfo.Age
+			order.Insutype = res.Output.Setlinfo.Insutype
+			order.PsnType = res.Output.Setlinfo.PsnType
+			order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
+			order.SetlTime = res.Output.Setlinfo.SetlTime
+			order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
+			order.MedType = res.Output.Setlinfo.MedType
+			order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
+			order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
+			order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
+			order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
+			order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
+			order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
+			order.HifpPay = res.Output.Setlinfo.HifpPay
+			order.CvlservPay = res.Output.Setlinfo.CvlservPay
+			order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
+			order.HifesPay = res.Output.Setlinfo.HifesPay
+			order.HifobPay = res.Output.Setlinfo.HifobPay
+			order.MafPay = res.Output.Setlinfo.MafPay
+			order.HifmiPay = res.Output.Setlinfo.HifmiPay
+			order.OthPay = res.Output.Setlinfo.OthPay
+			order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
+			order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
+			order.AcctPay = res.Output.Setlinfo.AcctPay
+			order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
+			order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
+			order.Balc = res.Output.Setlinfo.Balc
+			order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
+			order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
+			order.ClrOptins = res.Output.Setlinfo.ClrOptins
+			order.ClrWay = res.Output.Setlinfo.ClrWay
+			order.Creator = order.Creator
+			order.Modify = roles.AdminUserId
+			order.RequestLog = src_resquest
+			order.Diagnosis = diagnosis_id
+			setlDetail, _ := json.Marshal(res.Output.Setldetail)
+			detailStr := string(setlDetail)
+			order.SetlDetail = detailStr
+			err := service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
+			err = service.UpDateOrder(order)
+			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"failed_code": -10,
-					"msg":         res.ErrMsg,
+					"msg": "结算成功",
 				})
-				return
 			} else {
-				order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
-				order.OrderStatus = 2
-				order.MdtrtId = res.Output.Setlinfo.MdtrtID
-				order.SetlId = res.Output.Setlinfo.SetlID
-				order.PsnNo = res.Output.Setlinfo.PsnNo
-				order.PsnName = res.Output.Setlinfo.PsnName
-				order.PsnCertType = res.Output.Setlinfo.PsnCertType
-				order.Certno = res.Output.Setlinfo.Certno
-				order.Gend = res.Output.Setlinfo.Gend
-				order.Naty = res.Output.Setlinfo.Naty
-				order.Age = res.Output.Setlinfo.Age
-				order.Insutype = res.Output.Setlinfo.Insutype
-				order.PsnType = res.Output.Setlinfo.PsnType
-				order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
-				order.SetlTime = res.Output.Setlinfo.SetlTime
-				order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-				order.MedType = res.Output.Setlinfo.MedType
-				order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
-				order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
-				order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
-				order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
-				order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
-				order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
-				order.HifpPay = res.Output.Setlinfo.HifpPay
-				order.CvlservPay = res.Output.Setlinfo.CvlservPay
-				order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
-				order.HifesPay = res.Output.Setlinfo.HifesPay
-				order.HifobPay = res.Output.Setlinfo.HifobPay
-				order.MafPay = res.Output.Setlinfo.MafPay
-				order.HifmiPay = res.Output.Setlinfo.HifmiPay
-				order.OthPay = res.Output.Setlinfo.OthPay
-				order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
-				order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
-				order.AcctPay = res.Output.Setlinfo.AcctPay
-				order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
-				order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
-				order.Balc = res.Output.Setlinfo.Balc
-				order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
-				order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
-				order.ClrOptins = res.Output.Setlinfo.ClrOptins
-				order.ClrWay = res.Output.Setlinfo.ClrWay
-				order.Creator = order.Creator
-				order.Modify = roles.AdminUserId
-				order.RequestLog = src_resquest
-				order.Diagnosis = diagnosis_id
-				setlDetail, _ := json.Marshal(res.Output.Setldetail)
-				detailStr := string(setlDetail)
-				order.SetlDetail = detailStr
-				err := service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
-				err = service.UpDateOrder(order)
-				if err == nil {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "结算成功",
-					})
-				} else {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
-					return
-				}
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+				return
 			}
-
 		}
-
 	}
 }