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

controllers/zh/zh_his_api_controller.go

@@ -936,7 +936,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	id, _ := this.GetInt64("id")
 	patient_id, _ := this.GetInt64("patient_id")
 	admin_user_id, _ := this.GetInt64("admin_user_id")
-	//record_time := this.GetString("record_time")
+	record_time := this.GetString("record_time")
 
 	adminInfo := this.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
@@ -948,14 +948,14 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		return
 	}
 
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
-	//recordDateTime := theTime.Unix()
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
 
 	var patient service.Patients
 	if patient_id == 0 {
@@ -1052,6 +1052,45 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		record.OutHosptialTime = struct2402.Endtime
 		record.OutWay = 1
 		service.CreateHospitalRecord(&record)
+
+		orders, _ := service.GetHisOrderInfoByNumberThree(record.Number)
+
+		//orders, _ := service.GetHisOrderInfoByNumberThree(record.Number)
+
+		var total float64
+		for _, item := range orders {
+			total = total + item.DetItemFeeSumamt
+		}
+
+		//allTotal := fmt.Sprintf("%.4f", total)
+
+		order := &models.HisOrder{
+			UserOrgId:           adminInfo.CurrentOrgId,
+			HisPatientId:        record.ID,
+			PatientId:           record.PatientId,
+			SettleAccountsDate:  recordDateTime,
+			Ctime:               time.Now().Unix(),
+			Mtime:               time.Now().Unix(),
+			Status:              1,
+			Number:              record.Number,
+			Infcode:             0,
+			WarnMsg:             "",
+			Cainfo:              "",
+			ErrMsg:              "",
+			RespondTime:         "",
+			InfRefmsgid:         "",
+			OrderStatus:         1,
+			MdtrtId:             record.Number,
+			IsMedicineInsurance: 1,
+			PType:               1,
+			MedfeeSumamt:        total,
+		}
+		err = service.CreateOrder(order)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
+			return
+		}
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg": "出院成功",
 		})
@@ -1081,89 +1120,40 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	fapiao_code := c.GetString("fapiao_code")
 	fapiao_number := c.GetString("fapiao_number")
 
-	order, _ := service.GetHisOrderByID(order_id)
 	record, _ := service.GetInHospitalRecord(in_hospital_id)
-
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-
-	allTotal := fmt.Sprintf("%.4f", order.MedfeeSumamt)
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-
+	order, _ := service.GetHisOrderByID(order_id)
+	allTotal := fmt.Sprintf("%.4f", order.MedfeeSumamt)
 	var rf []*ResultFive
 	json.Unmarshal([]byte(record.Iinfo), &rf)
 	chrg_bchno := order.Number
 	cert_no := record.Certno
-
-	var insutypes []string
-
-	var insutype string
-	var is390 int = 0
-	var is310 int = 0
-
 	if record.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
-
 	}
-
 	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
 		return
 	}
-
-	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 len(insutypes) == 0 {
-		insutype = "310"
-	}
-
 	if record.IdCardType == 1 {
-
 	} else {
-
 		cert_no = record.Certno
-
 	}
-
-	result, src_resquest := service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
+	var result string
+	var src_resquest string
+	result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
 	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 ResultSeven
 	var resSeven10265 ResultSeven10265
 	if miConfig.Code == "H15049901371" {
-
 		if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1295,9 +1285,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 
 	var prescriptions []*models.HisPrescription
 
-	var start_time int64
-	var end_time int64
-
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
 		prescriptions, _ = service.GetZHHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
@@ -1313,14 +1300,12 @@ func (c *ZHHisApiController) GetUploadInfo() {
 			return
 		}
 		recordStartTime := theStartTime.Unix()
-		start_time = recordStartTime
 		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		recordEndTime := theEndTime.Unix()
-		end_time = recordEndTime
 		prescriptions, _ = service.GetZHMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
 
 	}
@@ -1607,6 +1592,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						service.CreateOrderInfo(info)
 					}
 				}
+
 				err := service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -1619,59 +1605,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				}
 
 			} else {
-				var total float64
-				for _, item := range prescriptions {
-					if item.Type == 1 { //药品
-						for _, subItem := range item.HisDoctorAdviceInfo {
-							total = total + (subItem.Price * subItem.PrescribingNumber)
-						}
-					}
-					if item.Type == 2 { //项目
-						for _, subItem := range item.HisPrescriptionProject {
-							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-							total = total + (subItem.Price * cnt)
-						}
-					}
-				}
-				for _, item := range prescriptions {
-					for _, subItem := range item.HisAdditionalCharge {
-						total = total + (subItem.Price * float64(subItem.Count))
-					}
-				}
-				allTotal := fmt.Sprintf("%.4f", total)
-				totals, _ := strconv.ParseFloat(allTotal, 64)
-
-				order := &models.HisOrder{
-					UserOrgId:           adminUser.CurrentOrgId,
-					HisPatientId:        record.ID,
-					PatientId:           record.PatientId,
-					SettleAccountsDate:  recordDateTime,
-					Ctime:               time.Now().Unix(),
-					Mtime:               time.Now().Unix(),
-					Status:              1,
-					Number:              record.Number,
-					Infcode:             0,
-					WarnMsg:             "",
-					Cainfo:              "",
-					ErrMsg:              "",
-					RespondTime:         "",
-					InfRefmsgid:         "",
-					OrderStatus:         1,
-					MdtrtId:             record.Number,
-					IsMedicineInsurance: 1,
-					SettleType:          settle_accounts_type,
-					SettleStartTime:     start_time,
-					SettleEndTime:       end_time,
-					Creator:             roles.AdminUserId,
-					Modify:              roles.AdminUserId,
-					PType:               1,
-					MedfeeSumamt:        totals,
-				}
-				err = service.CreateOrder(order)
-				if err != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
-					return
-				}
+
 				for _, subItem := range ress {
 					for _, item := range subItem.Output.Result {
 						temp := strings.Split(item.FeedetlSn, "-")
@@ -1690,7 +1624,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							project_id = id
 						}
 						info := &models.HisOrderInfo{
-							OrderNumber:      order.Number,
+							OrderNumber:      record.Number,
 							FeedetlSn:        item.FeedetlSn,
 							UploadDate:       time.Now().Unix(),
 							AdviceId:         advice_id,
@@ -1718,7 +1652,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							ChrgitmLv:        item.ChrgitmLv,
 							UserOrgId:        adminUser.CurrentOrgId,
 							HisPatientId:     record.ID,
-							OrderId:          order.ID,
 							ProjectId:        project_id,
 							Type:             types,
 							SettleType:       settle_accounts_type,
@@ -1726,6 +1659,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						service.CreateOrderInfo(info)
 					}
 				}
+				service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
 				service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
 				service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, record.Number, recordDateTime)
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -1900,13 +1834,14 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 
 	} else {
 		//prescriptions, _ = service.GetZHMonthHisUploadPrescription(adminUser.CurrentOrgId, patient_id, recordDateTime)
-		var order models.HisOrder
-		order, _ = service.GetHisOrderByID(order_id)
-		record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+		//var order models.HisOrder
+		//order, _ = service.GetHisOrderByID(order_id)
+		//record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+		record, _ := service.GetInHospitalRecord(his_patient_id)
 		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 		if config.IsOpen == 1 { //对接了医保，走医保流程
 
-			result := service.Gdyb2302(order.PsnNo, order.MdtrtId, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+			result := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1939,7 +1874,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 			}
 
 			if res2.Infcode == 0 {
-				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", result)
+				err := service.UpdataOrderStatus(order_id, record.Number, adminUser.CurrentOrgId, "", result)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg": "退费成功",
@@ -1955,7 +1890,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 				})
 			}
 		} else {
-			err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
+			err := service.UpdataOrderStatus(order_id, record.Number, adminUser.CurrentOrgId, "", "")
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "退费成功",

service/zh_his_service.go

@@ -972,7 +972,7 @@ func GetZHMonthHisUploadPrescription(org_id int64, patient_id int64, start_time
 
 func GetZHHisUploadOrderInfo(org_id int64, patient_id int64, record_date int64) (infos []*models.HisOrderInfo, err error) {
 	err = readDb.Model(&models.HisOrderInfo{}).
-		Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ? AND order_status = 4 AND p_type = 1", org_id, record_date, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ? ", org_id, record_date, record_date, patient_id).
 		Find(&infos).Error
 	return
 }
@@ -986,3 +986,8 @@ func UpDatePrescriptionOrderStatusTwo(patient_id int64, record_date int64, org_i
 	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = 1", org_id, record_date, record_date, patient_id).Updates(map[string]interface{}{"order_status": 1}).Error
 	return
 }
+
+//func GetAllOrderInfoByNumber(number string) (infos []*models.HisOrderInfo, err error){
+//
+//	err = readDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? AND ")
+//}