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

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionInfo.java

@@ -23,7 +23,7 @@ public class PrescriptionInfo extends IdEntity{
    private String drugRate;               //吃药频率
    private String drugRateName;          //用药频次名称
    private String drugFormat;             //药品规格
    private Integer num;                    //药品数目
    private Integer num;                    //药品总量（用来计算价格）
    private Integer isRefrigerate;         //是否冷藏 1是 0否
    private String direction;               //药品用法
    private Integer price;                    //药品单价 单位是分
@@ -31,7 +31,7 @@ public class PrescriptionInfo extends IdEntity{
    private String jwSubCode;//智业子处方号
    private String drugNumUnit;//数量单位编码
    private String drugNumUnitName;//数量单位名称
    private Integer cost;//金额 单位是分
    private Integer cost;//计算总额（num*price） 单位是分
    private Integer charge;//自付 单位是分
    private String bindFlag;//成组标志, 0.非成组,1.成组
    private Integer dayCount;//用药天数
@@ -40,7 +40,7 @@ public class PrescriptionInfo extends IdEntity{
    private String physicDose;//用药剂量
    private String physicDoseUnit;//剂量单位编码
    private String physicDoseUnitName;//剂量单位名称
    private String physicAmount;//用药总量
    private String physicAmount;//用药总量(实际用药量)
    private String physicAmountUnit;//总量单位编码
    private String physicAmountUnitName;//总量单位名称
    private String physicInjectPlace;//注射地点编码

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -980,6 +980,7 @@ public class PrescriptionInfoService extends BaseService {
    public JSONArray getTeamHealthDoctorCount(String doctor) {
        Doctor d = doctorDao.findByCode(doctor);
        AdminTeam ad = doctorAdminTeamDao.findByLeaderCode(d.getCode());
        List<AdminTeam> adminTeams = doctorAdminTeamDao.findByOrgCode(d.getHospital());
        List<Map<String, Object>> rsList = new ArrayList<>();
        if (adminTeams != null && adminTeams.size() > 0) {
@@ -1004,7 +1005,11 @@ public class PrescriptionInfoService extends BaseService {
                } else {
                    m.put("count", 0);
                }
                rsList.add(m);
                if(adminTeam.getId()==ad.getId()){
                    rsList.add(0,m);
                }else{
                    rsList.add(m);
                }
            }
        }
        return new JSONArray(rsList);