Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -3279,7 +3279,7 @@ public class SignPatientLabelInfoService extends BaseService {
        String sql = "";
        Object[] args = null;
        if (labelType.equals("5")) {
        if ("5".equals(labelType)) {
            Calendar today = Calendar.getInstance();
            Calendar startDate = Calendar.getInstance();
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -3332,7 +3332,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    " f.ptOpenid DESC";
                args = new Object[]{teamCode};
        }else {
            if (labelCode.equals("0")) {
            if ("0".equals(labelCode)) {
                sql = "SELECT " +
                        "    DISTINCT  t1.* " +
                        " FROM " +
@@ -3346,7 +3346,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
                args = new Object[]{teamCode, labelType, teamCode};
            } else {
            } else if(!org.springframework.util.StringUtils.isEmpty(labelType)){
                sql = "SELECT " +
                        "    DISTINCT t1.* " +
                        " FROM " +
@@ -3361,6 +3361,17 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
                args = new Object[]{labelCode, labelType, teamCode};
            }else{
                //标签类别为空的时候
                sql = "SELECT " +
                        "    DISTINCT t1.* " +
                        " FROM " +
                        "    wlyy_sign_family t1 " +
                        " WHERE " +
                        "     t1.status > 0 " +
                        "    AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
                args = new Object[]{teamCode};
            }
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/SignPatientLabelInfoController.java

@@ -234,7 +234,7 @@ public class SignPatientLabelInfoController extends BaseController {
            page = page > 0 ? page - 1 : 0;
            if (labelType.equals("9")) {
            if ("9".equals(labelType)) {
                JSONObject jsonObject = signWebService.getOverDuePatientsByTeam(labelCode, teamCode, page, pagesize);
                return write(200, "查询成功", "data", jsonObject);
            }
@@ -244,6 +244,7 @@ public class SignPatientLabelInfoController extends BaseController {
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionInfoController.java

@@ -8,6 +8,7 @@ import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;