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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -54,8 +54,10 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #gdyb_paasid = "sg03_prd"
-gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid = "zh_prd_yjyy"
+gdyb_passid = "sz_prd_yjyy"
+
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/his_api_controller.go

@@ -1889,9 +1889,24 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Mtime = time.Now().Unix()
 			his.Status = 1
 			service.UpdateHisPatientStatus(&his)
-			lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
-			if len(lists) == 1 {
-				service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
+
+			getYear := time.Now().Format("2006") //获取年
+			getMonth := time.Now().Format("01")  //获取月
+			getDay := time.Now().Format("02")
+
+			new_time := getYear + "-" + getMonth + "-" + getDay
+
+			new_timestamp, _ := time.ParseInLocation(timeLayout+" 15:04:05", new_time+" 00:00:00", loc)
+
+			if recordDateTime < new_timestamp.Unix() {
+				thisTime := time.Now()
+				thisTime = thisTime.AddDate(0, 0, -7)
+				service.UpdateHisPrescriptionHisIDTwo(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId, thisTime.Unix())
+			} else if recordDateTime == new_timestamp.Unix() {
+				lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+				if len(lists) == 1 {
+					service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
+				}
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"his_info": his,
@@ -1949,6 +1964,9 @@ func (c *HisApiController) GetUploadInfo() {
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 
+	id_str := c.GetString("ids")
+	ids_arr := strings.Split(id_str, ",")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
@@ -2071,7 +2089,13 @@ func (c *HisApiController) GetUploadInfo() {
 
 			data := make(map[string]interface{})
 			if settle_accounts_type == 1 { //日结
-				prescriptions, _ = service.GetNewHisPrescriptionTwo(adminUser.CurrentOrgId, his_patient_id, recordDateTime, reg_type)
+
+				if reg_type == 11 {
+					prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+				} else {
+					prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
+				}
+				//prescriptions, _ = service.GetNewHisPrescriptionTwo(adminUser.CurrentOrgId, his_patient_id, recordDateTime, reg_type)
 				data["pre"] = prescriptions
 
 			} else { //月结
@@ -2098,6 +2122,10 @@ func (c *HisApiController) GetUploadInfo() {
 
 			}
 
+			if reg_type == 1111 || reg_type == 1112 {
+				reg_type = 11
+			}
+
 			timestamp := time.Now().Unix()
 			tempTime := time.Unix(timestamp, 0)
 			timeFormat := tempTime.Format("20060102150405")
@@ -3163,6 +3191,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 
+	id_str := c.GetString("ids")
+	ids_arr := strings.Split(id_str, ",")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
@@ -3260,9 +3291,12 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 		data := make(map[string]interface{})
 		if settle_accounts_type == 1 { //日结
-			prescriptions, _ = service.GetNewHisPrescriptionTwo(adminUser.CurrentOrgId, his_patient_id, recordDateTime, reg_type)
+			if reg_type == 11 {
+				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+			} else {
+				prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
+			}
 			data["pre"] = prescriptions
-
 		} else { //月结
 			start_time_str := c.GetString("start_time")
 			end_time_str := c.GetString("end_time")
@@ -3286,6 +3320,10 @@ func (c *HisApiController) GetPreUploadInfo() {
 			data["pre"] = prescriptions
 		}
 
+		if reg_type == 1111 || reg_type == 1112 {
+			reg_type = 11
+		}
+
 		client := &http.Client{}
 		data["psn_no"] = his.PsnNo
 		data["mdtrt_id"] = his.Number

service/his_service.go

@@ -1227,6 +1227,12 @@ func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_t
 	return
 }
 
+func UpdateHisPrescriptionHisIDTwo(his_patient_id int64, patient_id int64, record_time int64, org_id int64, start_time int64) {
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date <= ? AND record_date >= ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0 AND order_status <> 2", record_time, start_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0 AND order_status <> 2", record_time, start_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	return
+}
+
 func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
 	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
 	return