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

controllers/sg/his_api_controller.go

@@ -3432,10 +3432,10 @@ func (c *HisApiController) Refund() {
 
 func (c *HisApiController) RefundNumber() {
 	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
+	//patient_id, _ := c.GetInt64("patient_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
-	//his_patient_id, _ := c.GetInt64("id")
+	his_patient_id, _ := c.GetInt64("id")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -3447,9 +3447,9 @@ func (c *HisApiController) RefundNumber() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 
-	//his, _ := service.GetNewHisPatientRecord(adminUser.CurrentOrgId, patient_id)
+	his, _ := service.GetNewHisPatientRecord(adminUser.CurrentOrgId, his_patient_id)
 	//patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	//order, _ := service.GetHisOrderByID(order_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -3492,7 +3492,7 @@ func (c *HisApiController) RefundNumber() {
 
 		if res2.Infcode == 0 {
 			//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
-			service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+			service.UpdataRegStatusTwo(his_patient_id, recordDateTime, adminUser.CurrentOrgId)
 
 			//err := service.UpdataRegStatus2()
 

service/his_service.go

@@ -718,7 +718,14 @@ func UpdataOrderStatus(id int64, number string, user_org_id int64, log string, r
 
 func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
 	writeDb.Model(&models.HisPatient{}).Where("patient_id = ? AND status = 1 AND record_date =? AND user_org_id = ?", patient_id, record_time, org_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+	//writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
+	//writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
+}
 
+func UpdataRegStatusTwo(his_patient_id int64, record_time int64, org_id int64) {
+	writeDb.Model(&models.HisPatient{}).Where("status = 1 AND record_date =? AND user_org_id = ? AND his_patient_id = ?", record_time, org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 }
 
 func UpdataRegStatus2(id int64) error {

service/sz_his_service.go

@@ -1428,6 +1428,7 @@ func UpdataOrderStatusSZ(id int64, number string, user_org_id int64, his_mz_numb
 
 func UpdataHisStatusSZ(user_org_id int64, his_mz_number string, his_number string, result string) (err error) {
 	err = writeDb.Model(&models.HisPatient{}).Where("status = 1 AND user_org_id = ? AND mz_number = ? AND number = ?", user_org_id, his_mz_number, his_number).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "refund_detail": result}).Error
+
 	return
 }