|
@@ -621,8 +621,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
621
|
621
|
origin, _ := c.GetInt64("origin", 0)
|
622
|
622
|
groupno, _ := c.GetInt64("groupno", -1)
|
623
|
623
|
|
624
|
|
- fmt.Println("orgind===2=323322323232323", origin)
|
625
|
|
- fmt.Println("groupno233333333333333333333", groupno)
|
|
624
|
+ record_date, _ := c.GetInt64("record_date")
|
|
625
|
+
|
626
|
626
|
if origin != 2 {
|
627
|
627
|
adminUserInfo := c.GetMobileAdminUserInfo()
|
628
|
628
|
execution_staff := adminUserInfo.AdminUser.Id
|
|
@@ -690,7 +690,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
690
|
690
|
UpdatedTime: time.Now().Unix(),
|
691
|
691
|
}
|
692
|
692
|
var err error
|
693
|
|
- fmt.Println("groupno==============", groupno)
|
|
693
|
+
|
694
|
694
|
if groupno > 0 {
|
695
|
695
|
|
696
|
696
|
// 查询信息规挡的设置天数
|
|
@@ -705,8 +705,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
705
|
705
|
|
706
|
706
|
//今日的日期减去设置的日期
|
707
|
707
|
cha_time = timeNewDate.Unix() - infor.WeekDay*86400
|
708
|
|
-
|
709
|
|
- if cha_time >= advices.AdviceDate {
|
|
708
|
+ fmt.Println("cha_time----------------", cha_time)
|
|
709
|
+ fmt.Println("advices.232323232222", record_date)
|
|
710
|
+ if cha_time >= record_date {
|
710
|
711
|
//查询审核是否允许
|
711
|
712
|
infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
|
712
|
713
|
//申请状态不允许的情况 拒绝修改
|
|
@@ -752,7 +753,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
|
752
|
753
|
//今日的日期减去设置的日期
|
753
|
754
|
cha_time = timeNewDate.Unix() - infor.WeekDay*86400
|
754
|
755
|
|
755
|
|
- if cha_time >= advices.AdviceDate {
|
|
756
|
+ if cha_time >= record_date {
|
756
|
757
|
//查询审核是否允许
|
757
|
758
|
infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
|
758
|
759
|
//申请状态不允许的情况 拒绝修改
|
|
@@ -1828,7 +1829,8 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
|
1828
|
1829
|
|
1829
|
1830
|
func (c *PatientApiController) CheckDoctorAdvice() {
|
1830
|
1831
|
origin, _ := c.GetInt64("origin", 0)
|
1831
|
|
-
|
|
1832
|
+ record_date, _ := c.GetInt64("record_date")
|
|
1833
|
+ patient_id, _ := c.GetInt64("patient_id")
|
1832
|
1834
|
if origin != 2 {
|
1833
|
1835
|
groupno, _ := c.GetInt64("groupno", -1)
|
1834
|
1836
|
var ids []string
|
|
@@ -1912,9 +1914,9 @@ func (c *PatientApiController) CheckDoctorAdvice() {
|
1912
|
1914
|
//今日的日期减去设置的日期
|
1913
|
1915
|
cha_time = timeNewDate.Unix() - infor.WeekDay*86400
|
1914
|
1916
|
|
1915
|
|
- if cha_time >= advices.AdviceDate {
|
|
1917
|
+ if cha_time >= record_date {
|
1916
|
1918
|
//查询审核是否允许
|
1917
|
|
- infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
|
|
1919
|
+ infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminUserInfo.Org.Id)
|
1918
|
1920
|
//申请状态不允许的情况 拒绝修改
|
1919
|
1921
|
if infor.ApplicationStatus != 1 {
|
1920
|
1922
|
c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
|
|
@@ -2036,9 +2038,9 @@ func (c *PatientApiController) CheckDoctorAdvice() {
|
2036
|
2038
|
//今日的日期减去设置的日期
|
2037
|
2039
|
cha_time = timeNewDate.Unix() - infor.WeekDay*86400
|
2038
|
2040
|
|
2039
|
|
- if cha_time >= item.AdviceDate {
|
|
2041
|
+ if cha_time >= record_date {
|
2040
|
2042
|
//查询审核是否允许
|
2041
|
|
- infor, _ := service.GetDialysisInformationByRecordDate(item.PatientId, item.AdviceDate, adminInfo.Org.Id)
|
|
2043
|
+ infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminInfo.Org.Id)
|
2042
|
2044
|
//申请状态不允许的情况 拒绝修改
|
2043
|
2045
|
if infor.ApplicationStatus != 1 {
|
2044
|
2046
|
c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
|